From 627db97b30fc3f35806666eebfd3f967322f3680 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 17 May 2019 16:45:40 -0400 Subject: [PATCH] use 7-z for extract --- src/travis/windows-x86-before-install.sh | 4 +++- src/travis/windows-x86_64-before-install.sh | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh index ae96c090..df3b0113 100755 --- a/src/travis/windows-x86-before-install.sh +++ b/src/travis/windows-x86-before-install.sh @@ -7,7 +7,8 @@ if [ ! -e $msifile ]; then wget --quiet https://slproweb.com/download/$msifile fi if [ ! -e ssl/libeay32.dll ]; then - msiexec /a $msifile /qn TARGETDIR=ssl + echo "Extracting $msifile..." + /c/Program\ Files/7-Zip/7z.exe e $msifile -ossl fi echo "OpenSSL dlls..." ls -al ssl @@ -16,6 +17,7 @@ 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 +cd ~ pip install --upgrade pip pip freeze > upgrades.txt pip install --upgrade -r upgrades.txt diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index 69d03354..d3876215 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -3,10 +3,12 @@ cinst -y python3 cd ~/pybuild msifile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.msi if [ ! -e $msifile ]; then + echo "Downloading $msifile..." wget --quiet https://slproweb.com/download/$msifile fi if [ ! -e ssl/libeay32.dll ]; then - msiexec /a $msifile /qn TARGETDIR=ssl + echo "Extracting $msifile..." + /c/Program\ Files/7-Zip/7z.exe e $msifile -ossl fi echo "OpenSSL dlls..." ls -al ssl @@ -15,6 +17,7 @@ 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 +cd ~ pip install --upgrade pip pip freeze > upgrades.txt pip install --upgrade -r upgrades.txt