diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh index 581a97d2..9bf65cf5 100755 --- a/src/travis/windows-x86-before-install.sh +++ b/src/travis/windows-x86-before-install.sh @@ -1,5 +1,8 @@ echo "Installing Net-Framework-Core..." export mypath=$(pwd) + +choco upgrade all + until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done cd ~ export exefile=Win32OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe @@ -36,10 +39,6 @@ tar xf develop.tar.gz cd pyinstaller-develop/bootloader echo "bootloader before:" 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 echo "bootloader after:" md5sum ../PyInstaller/bootloader/Windows-32bit/* diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index a55dc2db..41623b5c 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -1,5 +1,8 @@ echo "Installing Net-Framework-Core..." export mypath=$(pwd) + +choco upgrade all + until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done cd ~ export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe @@ -39,9 +42,6 @@ cd pyinstaller-develop/bootloader echo "bootloader before:" 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 cat build/config.log