mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-21 11:39:55 +02:00
Win-Installer:fix for fpc 2.6. branch // better error checks
git-svn-id: trunk@42515 -
This commit is contained in:
parent
7d0f344a06
commit
eca628b4c1
@ -38,7 +38,7 @@ SET INSTALL_BASE=%BUILDDIR%\fpc\%FPCVERSION%
|
|||||||
SET INSTALL_BINDIR=%INSTALL_BASE%\bin\%FPCFULLTARGET%
|
SET INSTALL_BINDIR=%INSTALL_BASE%\bin\%FPCFULLTARGET%
|
||||||
|
|
||||||
SET FPCMAKE=%SOURCE_DIR%\utils\fpcm\bin\%FPCFULLTARGET%\fpcmake.exe
|
SET FPCMAKE=%SOURCE_DIR%\utils\fpcm\bin\%FPCFULLTARGET%\fpcmake.exe
|
||||||
IF ("%FPCVERSION:~0,3%" == "2.6") SET FPCMAKE=%SOURCE_DIR%\utils\fpcm\fpcmake.exe
|
IF "%FPCVERSION:~0,3%" == "2.6" SET FPCMAKE=%SOURCE_DIR%\utils\fpcm\fpcmake.exe
|
||||||
|
|
||||||
%MAKEEXE% compiler_install rtl_install packages_install utils_install INSTALL_PREFIX=%INSTALL_BASE% PP=%COMPILER% FPCMAKE=%FPCMAKE% >> %LOGFILE%
|
%MAKEEXE% compiler_install rtl_install packages_install utils_install INSTALL_PREFIX=%INSTALL_BASE% PP=%COMPILER% FPCMAKE=%FPCMAKE% >> %LOGFILE%
|
||||||
|
|
||||||
|
@ -149,6 +149,7 @@ del %INSTALL_BINDIR%\gdb.exe
|
|||||||
|
|
||||||
:: exit if no compiler has been made
|
:: exit if no compiler has been made
|
||||||
if not exist %INSTALL_BINDIR%\fpc.exe goto WARNING_NO_COMPILER_MADE
|
if not exist %INSTALL_BINDIR%\fpc.exe goto WARNING_NO_COMPILER_MADE
|
||||||
|
if not exist %INSTALL_BINDIR%\fpcmkcfg.exe goto WARNING_NO_COMPILER_MADE
|
||||||
|
|
||||||
%INSTALL_BINDIR%\fpcmkcfg.exe -d "basepath=%INSTALL_BASE%" -o %INSTALL_BINDIR%\fpc.cfg
|
%INSTALL_BINDIR%\fpcmkcfg.exe -d "basepath=%INSTALL_BASE%" -o %INSTALL_BINDIR%\fpc.cfg
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user