Mercurial > hg > easyhg
comparison deploy/win32/build-and-package.bat @ 718:dfabf544f682
Fix incorrect packaging of 64-bit CRT with 32-bit binaries
author | Chris Cannam |
---|---|
date | Thu, 13 Dec 2018 07:10:21 +0000 |
parents | 52b8a499f379 |
children | 7942b7633505 |
comparison
equal
deleted
inserted
replaced
717:2a27275b8540 | 718:dfabf544f682 |
---|---|
8 if not exist "C:\Program Files (x86)\WiX Toolset v3.11\bin" ( | 8 if not exist "C:\Program Files (x86)\WiX Toolset v3.11\bin" ( |
9 @ echo Could not find WiX Toolset | 9 @ echo Could not find WiX Toolset |
10 @ exit /b 2 | 10 @ exit /b 2 |
11 ) | 11 ) |
12 | 12 |
13 if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT" ( | 13 if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x86\Microsoft.VC141.CRT" ( |
14 @ echo Could not find Windows CRT directory | 14 @ echo Could not find Windows CRT directory |
15 @ exit /b 2 | 15 @ exit /b 2 |
16 ) | 16 ) |
17 | 17 |
18 if not exist "C:/Python27/Lib/site-packages/PyQt5/" ( | 18 if not exist "C:/Python27/Lib/site-packages/PyQt5/" ( |
25 @ exit /b 2 | 25 @ exit /b 2 |
26 ) | 26 ) |
27 | 27 |
28 set ORIGINALPATH=%PATH% | 28 set ORIGINALPATH=%PATH% |
29 set PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin;%PATH% | 29 set PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin;%PATH% |
30 set CRTDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT | 30 set CRTDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x86\Microsoft.VC141.CRT |
31 set PYPACKAGEDIR=C:/Python27/Lib/site-packages | 31 set PYPACKAGEDIR=C:/Python27/Lib/site-packages |
32 set PYQTDIR=%PYPACKAGEDIR%/PyQt5/ | 32 set PYQTDIR=%PYPACKAGEDIR%/PyQt5/ |
33 set PYCRYPTODIR=%PYPACKAGEDIR%/Crypto/ | 33 set PYCRYPTODIR=%PYPACKAGEDIR%/Crypto/ |
34 set NAME=Open Source Developer, Christopher Cannam | 34 set NAME=Open Source Developer, Christopher Cannam |
35 | 35 |