diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh index 11adcb03..73ad4a83 100755 --- a/src/travis/windows-x86-before-install.sh +++ b/src/travis/windows-x86-before-install.sh @@ -1,7 +1,6 @@ echo "Installing Net-Framework-Core..." export mypath=$(pwd) until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done -cinst -y --forcex86 python3 cd ~/pybuild export exefile=Win32OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe if [ ! -e $exefile ]; then @@ -10,15 +9,16 @@ if [ ! -e $exefile ]; then fi echo "Installing $exefile..." powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl" +cinst -y --forcex86 python3 +until cinst -y wixtoolset; do echo "trying again..."; done echo "OpenSSL dlls..." ls -alRF /c/ssl echo "c drive" ls -al /c/ echo "Python dlls..." ls -al /c/Python37/DLLs -cp -v /c/ssl/*.dll /c/Python37/DLLs +until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done export PATH=$PATH:/c/Python37/scripts -until cinst -y wixtoolset; do echo "trying again..."; done cd $mypath pip install --upgrade pip pip freeze > upgrades.txt diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index 7d632e0d..0a04610c 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -1,7 +1,6 @@ echo "Installing Net-Framework-Core..." export mypath=$(pwd) until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done -cinst -y python3 cd ~/pybuild export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe if [ ! -e $exefile ]; then @@ -10,15 +9,16 @@ if [ ! -e $exefile ]; then fi echo "Installing $exefile..." powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl" +cinst -y python3 +until cinst -y wixtoolset; do echo "trying again..."; done echo "OpenSSL dlls..." ls -alRF /c/ssl echo "c drive" ls -al /c echo "Python dlls..." ls -al /c/Python37/DLLs -cp -v /c/ssl/*.dll /c/Python37/DLLs +until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done export PATH=$PATH:/c/Python37/scripts -until cinst -y wixtoolset; do echo "trying again..."; done cd $mypath pip install --upgrade pip pip freeze > upgrades.txt