paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-16 00:19:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Installer, Win: Fix for git / restore binw32/binw64

Browse Source
This commit is contained in:
Martin 2021-10-16 12:44:32 +02:00
parent 78bb88de35
commit 056cc6dd26
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,7 @@ FOR /F %%L IN ('%RELEASE_PPC% -iTP') DO SET FPCTARGETCPU=%%L
SET FPCFULLTARGET=%FPCTARGETCPU%-%FPCTARGETOS%
SET FPCBINDIR=%FPCGITDIR%\install\binw%FPCTARGETOS:~-2%
SET FPCBINTREE=install/binw%FPCTARGETOS:~-2%
SET MAKEEXE=%FPCBINDIR%\make.exe
SET PATCHEXE=%FPCGITDIR%\install\binw32\patch.exe
SET LOGFILE=%CD%\installer.log
@ -140,8 +141,9 @@ call build-fpc.bat
:: INSTALL_BINDIR is set by build-fpc.bat
mkdir %BUILDDIR%\fpcbins
%GIT% -C %FPCBINDIR% --work-tree=%BUILDDIR%\fpcbins restore . >> %LOGFILE%
%GIT% -C %FPCGITDIR% --work-tree=%BUILDDIR%\fpcbins restore --source=HEAD:%FPCBINTREE% . >> %LOGFILE%
IF %ERRORLEVEL% NEQ 0 GOTO GITERR
mv -f %BUILDDIR%\fpcbins\*.* %INSTALL_BINDIR%
%FPCBINDIR%\rm -rf %BUILDDIR%\fpcbins
del %INSTALL_BINDIR%\gdb.exe
:: copy from 32 bit, missing in 64bit