paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-24 17:59:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

win installer: fixed scripts, so they can handle fpc with FCL in separate directory (2.0) or in the packages directory (2.1).

Browse Source 
git-svn-id: trunk@10699 -
This commit is contained in:
vincents 2007-02-28 11:26:17 +00:00
parent c2a98ebe21
commit 400af6c0eb
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/install/win/build-fpc.bat
View File

@ -2,6 +2,7 @@ SET OLDCURDIR=%CD%
SET OLDCURDRIVE=%CD:~,2%
SET SOURCE_DIR=%FPCSVNDIR%\fpcsrc
SET HASFCL=0
%SOURCE_DIR:~,2%
cd %SOURCE_DIR%
@ -9,21 +10,25 @@ cd %SOURCE_DIR%
%MAKEEXE% compiler_cycle PP=%RELEASE_PPC% >> %LOGFILE% 2>&1
FOR /F %%L IN ('%SOURCE_DIR%\compiler\utils\fpc.exe -PB') DO SET COMPILER=%SOURCE_DIR%\compiler\%%L
FOR /F %%L IN ('%COMPILER% -iV') DO SET FPCVERSION=%%L
IF "%FPCVERSION:~,3%"=="2.0" SET HASFCL=1
%MAKEEXE% -C rtl clean PP=%COMPILER% >> %LOGFILE%
%MAKEEXE% -C packages clean PP=%COMPILER% >> %LOGFILE%
%MAKEEXE% -C fcl clean PP=%COMPILER% >> %LOGFILE%
%MAKEEXE% rtl packages_base_all fcl packages_extra_all PP=%COMPILER% OPT="-g -gl -Ur -CX" >> %LOGFILE%
IF %HASFCL%==1 %MAKEEXE% -C fcl clean PP=%COMPILER% >> %LOGFILE%
IF %HASFCL%==0 %MAKEEXE% rtl packages PP=%COMPILER% OPT="-g -Ur -CX" >> %LOGFILE%
IF %HASFCL%==1 %MAKEEXE% rtl packages_base_all fcl packages_extra_all PP=%COMPILER% OPT="-g -Ur -CX" >> %LOGFILE%
%MAKEEXE% utils PP=%COMPILER% OPT="-CX -XX -Xs" DATA2INC=%SOURCE_DIR%\utils\data2inc >> %LOGFILE%
FOR /F %%L IN ('%COMPILER% -iV') DO SET FPCVERSION=%%L
SET INSTALL_BASE=%BUILDDIR%\fpc\%FPCVERSION%
SET INSTALL_BINDIR=%INSTALL_BASE%\bin\%FPCFULLTARGET%
%MAKEEXE% compiler_install rtl_install fcl_install packages_install utils_install INSTALL_PREFIX=%INSTALL_BASE% PP=%COMPILER% FPCMAKE=%SOURCE_DIR%\utils\fpcm\fpcmake.exe >> %LOGFILE%
%MAKEEXE% compiler_install rtl_install packages_install utils_install INSTALL_PREFIX=%INSTALL_BASE% PP=%COMPILER% FPCMAKE=%SOURCE_DIR%\utils\fpcm\fpcmake.exe >> %LOGFILE%
IF %HASFCL%==1 %MAKEEXE% fcl_install INSTALL_PREFIX=%INSTALL_BASE% PP=%COMPILER% FPCMAKE=%SOURCE_DIR%\utils\fpcm\fpcmake.exe >> %LOGFILE%
::SET COMPILER=%INSTALL_BINDIR%\ppc386.exe
FOR /F %%L IN ('%INSTALL_BINDIR%\fpc.exe -PB') DO SET COMPILER=%%L
%MAKEEXE% clean PP=%COMPILER% >> %LOGFILE%
::%MAKEEXE% clean PP=%COMPILER% >> %LOGFILE%
%OLDCURDRIVE%
cd %OLDCURDIR%

2
tools/install/win/create_installer.bat
View File

@ -66,7 +66,7 @@ del %INSTALL_BINDIR%\gdb.exe
:: copy fpc source
gmkdir -p %INSTALL_BASE%\source
%SVN% export %FPCSVNDIR%\fpcsrc\rtl %INSTALL_BASE%\source\rtl >> %LOGFILE%
%SVN% export %FPCSVNDIR%\fpcsrc\fcl %INSTALL_BASE%\source\fcl >> %LOGFILE%
IF %HASFCL%==1 %SVN% export %FPCSVNDIR%\fpcsrc\fcl %INSTALL_BASE%\source\fcl >> %LOGFILE%
%SVN% export %FPCSVNDIR%\fpcsrc\packages %INSTALL_BASE%\source\packages >> %LOGFILE%
:: exit if no compiler has been made