From 056cc6dd26c3c812c99f0d2970675382fb8c051a Mon Sep 17 00:00:00 2001 From: Martin Date: Sat, 16 Oct 2021 12:44:32 +0200 Subject: [PATCH] Installer, Win: Fix for git / restore binw32/binw64 --- tools/install/win/create_installer.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/install/win/create_installer.bat b/tools/install/win/create_installer.bat index 87a99ee629..ade5ee3998 100644 --- a/tools/install/win/create_installer.bat +++ b/tools/install/win/create_installer.bat @@ -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