Win-Installer:fix for fpc 2.6. branch // better error checks

git-svn-id: trunk@42515 -
This commit is contained in:
martin 2013-08-29 10:56:21 +00:00
parent 7d0f344a06
commit eca628b4c1
2 changed files with 2 additions and 1 deletions

View File

@ -38,7 +38,7 @@ SET INSTALL_BASE=%BUILDDIR%\fpc\%FPCVERSION%
SET INSTALL_BINDIR=%INSTALL_BASE%\bin\%FPCFULLTARGET%
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%

View File

@ -149,6 +149,7 @@ del %INSTALL_BINDIR%\gdb.exe
:: exit if no compiler has been 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