diff options
| -rw-r--r-- | buildwin.bat | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/buildwin.bat b/buildwin.bat index af26380..7ffe620 100644 --- a/buildwin.bat +++ b/buildwin.bat @@ -10,18 +10,20 @@ IF "%DEV_TOOLS%" == "" ( IF "%GIT%" == "" ( SET GIT="C:\Git4Win\bin\git.exe" ) +IF "%INSTALLDIR%" == "" ( + SET INSTALLDIR=%TOP%\0_INST\NSIS +) SET PYTHONDIR=%DEV_TOOLS%\Python\3.8.10\x86-mingw64 %TOP%\busybox.exe rm -Rf pyvenv %PYTHONDIR%\python.exe -m venv %TOP%\pyvenv -call %TOP%\pyvenv\Scripts\activate.bat +CALL %TOP%\pyvenv\Scripts\activate.bat %TOP%\pyvenv\Scripts\python.exe -m pip install --upgrade pip pip3 install scons SET SCONS=%TOP%\pyvenv\Scripts\scons.exe SET MSVCBT=%DEV_TOOLS%\WinSDK\VS2019BT -SET INSTALLDIR=%TOP%\0_INST\NSIS %TOP%\busybox.exe mkdir -p %INSTALLDIR% %TOP%\busybox.exe rm -Rf Zlib @@ -35,8 +37,10 @@ CD nsis-build %GIT% checkout %VERSION% %TOP%\busybox patch -p1 < ../patches/tmpfilename.patch CALL %MSVCBT%\setvcvars.bat 2019 x86 -%SCONS% MSTOOLKIT=yes MSVC_USE_SCRIPT=None MSVS_VERSION=10.0 -%SCONS% MSTOOLKIT=yes MSVC_USE_SCRIPT=None MSVS_VERSION=10.0 PREFIX=%INSTALLDIR% install + +REM CALL %SCONS% MSTOOLKIT=yes MSVC_USE_SCRIPT=None MSVS_VERSION=10.0 +CALL %SCONS% MSTOOLKIT=yes MSVC_USE_SCRIPT=None MSVS_VERSION=10.0 PREFIX=%INSTALLDIR% install + CALL %DEV_TOOLS%\TS-CodeSigner\signfile.bat %INSTALLDIR%\makensis.exe CALL %DEV_TOOLS%\TS-CodeSigner\signfile.bat %INSTALLDIR%\makensisw.exe CD %INSTALLDIR% |