deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-29 10:21:35 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

try upgrading chocolatey packages to solve bootloader compile issue

Browse Source
This commit is contained in:
Jay Lee
2020-03-27 14:19:26 -04:00
parent b4ccc83696
commit 73bfd6abaa
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,8 @@
echo "Installing Net-Framework-Core..." echo "Installing Net-Framework-Core..."
export mypath=$(pwd) export mypath=$(pwd)
choco upgrade all
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 ~
export exefile=Win32OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe export exefile=Win32OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
@@ -36,10 +39,6 @@ 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/*
# hack to fix compile on Travis
perl -i -p0e 's/#ifndef HAVE_STRLEN.*?#endif//se' src/pyi_utils.*
$python ./waf all --target-arch=32bit $python ./waf all --target-arch=32bit
echo "bootloader after:" echo "bootloader after:"
md5sum ../PyInstaller/bootloader/Windows-32bit/* md5sum ../PyInstaller/bootloader/Windows-32bit/*

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

@@ -1,5 +1,8 @@
echo "Installing Net-Framework-Core..." echo "Installing Net-Framework-Core..."
export mypath=$(pwd) export mypath=$(pwd)
choco upgrade all
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 ~
export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
@@ -39,9 +42,6 @@ cd pyinstaller-develop/bootloader
echo "bootloader before:" echo "bootloader before:"
md5sum ../PyInstaller/bootloader/Windows-64bit/* md5sum ../PyInstaller/bootloader/Windows-64bit/*
# hack to fix compile on Travis
perl -i -p0e 's/#ifndef HAVE_STRLEN.*?#endif//se' src/pyi_utils.*
$python ./waf all --target-arch=64bit $python ./waf all --target-arch=64bit
cat build/config.log cat build/config.log