deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-04 12:51:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Install/use older MSVC to compile bootloader

Browse Source
This commit is contained in:
Jay Lee
2020-03-27 15:05:38 -04:00
parent 73bfd6abaa
commit 8c59241abb
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/travis/windows-x86-before-install.sh
View File

@@ -1,7 +1,7 @@
echo "Installing Net-Framework-Core..." echo "Installing Net-Framework-Core..."
export mypath=$(pwd) export mypath=$(pwd)
choco upgrade all choco install vcbuildtools
until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done
cd ~ cd ~
@@ -39,7 +39,7 @@ tar xf develop.tar.gz
cd pyinstaller-develop/bootloader cd pyinstaller-develop/bootloader
echo "bootloader before:" echo "bootloader before:"
md5sum ../PyInstaller/bootloader/Windows-32bit/* md5sum ../PyInstaller/bootloader/Windows-32bit/*
$python ./waf all --target-arch=32bit $python ./waf all --msvc_version "msvc 14.0"
echo "bootloader after:" echo "bootloader after:"
md5sum ../PyInstaller/bootloader/Windows-32bit/* md5sum ../PyInstaller/bootloader/Windows-32bit/*
echo "PATH: $PATH" echo "PATH: $PATH"

5
src/travis/windows-x86_64-before-install.sh
View File

@@ -1,7 +1,7 @@
echo "Installing Net-Framework-Core..." echo "Installing Net-Framework-Core..."
export mypath=$(pwd) export mypath=$(pwd)
choco upgrade all choco install vcbuildtools
until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done
cd ~ cd ~
@@ -42,8 +42,7 @@ cd pyinstaller-develop/bootloader
echo "bootloader before:" echo "bootloader before:"
md5sum ../PyInstaller/bootloader/Windows-64bit/* md5sum ../PyInstaller/bootloader/Windows-64bit/*
$python ./waf all --target-arch=64bit $python ./waf all --target-arch=64bit --msvc_version "msvc 14.0"
cat build/config.log
echo "bootloader after:" echo "bootloader after:"
md5sum ../PyInstaller/bootloader/Windows-64bit/* md5sum ../PyInstaller/bootloader/Windows-64bit/*