From 8c59241abb5ca8d8c55109e5033202d723af5032 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 27 Mar 2020 15:05:38 -0400 Subject: [PATCH] Install/use older MSVC to compile bootloader --- src/travis/windows-x86-before-install.sh | 4 ++-- src/travis/windows-x86_64-before-install.sh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh index 9bf65cf5..c6d04583 100755 --- a/src/travis/windows-x86-before-install.sh +++ b/src/travis/windows-x86-before-install.sh @@ -1,7 +1,7 @@ echo "Installing Net-Framework-Core..." export mypath=$(pwd) -choco upgrade all +choco install vcbuildtools until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done cd ~ @@ -39,7 +39,7 @@ tar xf develop.tar.gz cd pyinstaller-develop/bootloader echo "bootloader before:" md5sum ../PyInstaller/bootloader/Windows-32bit/* -$python ./waf all --target-arch=32bit +$python ./waf all --msvc_version "msvc 14.0" echo "bootloader after:" md5sum ../PyInstaller/bootloader/Windows-32bit/* echo "PATH: $PATH" diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index 41623b5c..54a3498e 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -1,7 +1,7 @@ echo "Installing Net-Framework-Core..." export mypath=$(pwd) -choco upgrade all +choco install vcbuildtools until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done cd ~ @@ -42,8 +42,7 @@ cd pyinstaller-develop/bootloader echo "bootloader before:" md5sum ../PyInstaller/bootloader/Windows-64bit/* -$python ./waf all --target-arch=64bit -cat build/config.log +$python ./waf all --target-arch=64bit --msvc_version "msvc 14.0" echo "bootloader after:" md5sum ../PyInstaller/bootloader/Windows-64bit/*