diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh index b4b685b7..3d35895e 100755 --- a/src/travis/windows-x86-before-install.sh +++ b/src/travis/windows-x86-before-install.sh @@ -1,12 +1,19 @@ until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done cinst -y --forcex86 python3 -#cinst -y --forcex86 openssl.light cd ~/pybuild -if [ ! -e Win32OpenSSL_Light-1_1_1b.exe ]; then - wget --quiet https://slproweb.com/download/Win32OpenSSL_Light-1_1_1b.exe +msifile=Win32OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.msi +if [ ! -e $msifile ]; then + echo "Downloading $msifile..." + wget --quiet https://slproweb.com/download/$msifile fi -./Win32OpenSSL_Light-1_1_1b.exe /silent /sp- /suppressmsgboxes /DIR=$ProgramFiles\OpenSSL -f -cp -v /c/Program\ Files/OpenSSL/*.dll /c/Python37/DLLs +if { ! -e ssl/libeay32.dll ]; then + msiexec /a $msifile /qn TARGETDIR=ssl +fi +echo "OpenSSL dlls..." +ls -al ssl +echo "Python dlls..." +ls -al /c/Python37/DLLs +cp -v ssl/*.dll /c/Python37/DLLs export PATH=$PATH:/c/Python37/scripts until cinst -y wixtoolset; do echo "trying again..."; done pip install --upgrade pip diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index e30aaa06..9e12b4ae 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -1,10 +1,17 @@ until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done cinst -y python3 cd ~/pybuild -if [ ! -e Win64OpenSSL_Light-1_1_1b.exe ]; then - wget --quiet https://slproweb.com/download/Win64OpenSSL_Light-1_1_1b.exe +msifile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.msi +if [ ! -e $msifile ]; then + wget --quiet https://slproweb.com/download/$msifile fi -./Win64OpenSSL_Light-1_1_1b.exe /silent /sp- /suppressmsgboxes /DIR=$ProgramFiles\OpenSSL -f +if { ! -e ssl/libeay32.dll ]; then + msiexec /a $msifile /qn TARGETDIR=ssl +fi +echo "OpenSSL dlls..." +ls -al ssl +echo "Python dlls..." +ls -al /c/Python37/DLLs cp -v /c/Program\ Files/OpenSSL/bin/*.dll /c/Python37/DLLs export PATH=$PATH:/c/Python37/scripts until cinst -y wixtoolset; do echo "trying again..."; done