deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

use 7-z for extract

Browse Source
This commit is contained in:
Jay Lee
2019-05-17 16:45:40 -04:00
parent bbdce9536b
commit 627db97b30
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,8 @@ if [ ! -e $msifile ]; then
wget --quiet https://slproweb.com/download/$msifile wget --quiet https://slproweb.com/download/$msifile
fi fi
if [ ! -e ssl/libeay32.dll ]; then 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 fi
echo "OpenSSL dlls..." echo "OpenSSL dlls..."
ls -al ssl ls -al ssl
@@ -16,6 +17,7 @@ ls -al /c/Python37/DLLs
cp -v ssl/*.dll /c/Python37/DLLs cp -v ssl/*.dll /c/Python37/DLLs
export PATH=$PATH:/c/Python37/scripts export PATH=$PATH:/c/Python37/scripts
until cinst -y wixtoolset; do echo "trying again..."; done until cinst -y wixtoolset; do echo "trying again..."; done
cd ~
pip install --upgrade pip pip install --upgrade pip
pip freeze > upgrades.txt pip freeze > upgrades.txt
pip install --upgrade -r upgrades.txt pip install --upgrade -r upgrades.txt

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

@@ -3,10 +3,12 @@ cinst -y python3
cd ~/pybuild cd ~/pybuild
msifile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.msi msifile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.msi
if [ ! -e $msifile ]; then if [ ! -e $msifile ]; then
echo "Downloading $msifile..."
wget --quiet https://slproweb.com/download/$msifile wget --quiet https://slproweb.com/download/$msifile
fi fi
if [ ! -e ssl/libeay32.dll ]; then 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 fi
echo "OpenSSL dlls..." echo "OpenSSL dlls..."
ls -al ssl ls -al ssl
@@ -15,6 +17,7 @@ ls -al /c/Python37/DLLs
cp -v /c/Program\ Files/OpenSSL/bin/*.dll /c/Python37/DLLs cp -v /c/Program\ Files/OpenSSL/bin/*.dll /c/Python37/DLLs
export PATH=$PATH:/c/Python37/scripts export PATH=$PATH:/c/Python37/scripts
until cinst -y wixtoolset; do echo "trying again..."; done until cinst -y wixtoolset; do echo "trying again..."; done
cd ~
pip install --upgrade pip pip install --upgrade pip
pip freeze > upgrades.txt pip freeze > upgrades.txt
pip install --upgrade -r upgrades.txt pip install --upgrade -r upgrades.txt