windows installer: some fixes related to applying fpc patch

git-svn-id: trunk@11361 -
This commit is contained in:
vincents 2007-06-23 22:39:16 +00:00
parent d7aba592b4
commit 656707033b
2 changed files with 5 additions and 4 deletions

View File

@ -13,7 +13,7 @@ cd %SOURCE_DIR%
:: apply patch
if [%PATCHFILE]==[] GOTO NO_PATCH
patch -p0 -i %PATCHDIR%\%PATCHFILE%
%PATCHEXE% -p0 -i %PATCHDIR%\%PATCHFILE%
:NO_PATCH
@ -49,10 +49,10 @@ IF %HASFCL%==1 %MAKEEXE% fcl_install INSTALL_PREFIX=%INSTALL_BASE% PP=%COMPILER%
FOR /F %%L IN ('%INSTALL_BINDIR%\fpc.exe -PB') DO SET COMPILER=%%L
:: move fpc source to final location
gmkdir -p %INSTALL_BASE%\source
mv %BUILDDIR%\fpc\source %INSTALL_BASE% >> %LOGFILE%
rm -rf %SOURCE_DIR%
%OLDCURDRIVE%
cd %OLDCURDIR%
rm -rf %SOURCE_DIR%

View File

@ -40,6 +40,7 @@ SET FPCFULLTARGET=%FPCTARGETCPU%-%FPCTARGETOS%
SET FPCBINDIR=%FPCSVNDIR%\install\binw%FPCTARGETOS:~-2%
SET MAKEEXE=%FPCBINDIR%\make.exe
SET PATCHEXE=%FPCSVNDIR%\install\binw32\patch.exe
SET LOGFILE=%CD%\installer.log
SET PATCHDIR=%CD%\..\patches
FOR /F %%L IN ('%FPCBINDIR%\gdate.exe +%%Y%%m%%d') DO SET DATESTAMP=%%L