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 19 Packages Projects Releases Wiki Activity

Upgrade OpenSSL on Mac/Win

Browse Source
This commit is contained in:
Jay Lee
2020-03-25 08:12:07 -04:00
parent 8a18df0e7f
commit a54a29a3ac
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/travis/osx-x86_64-before-install.sh
View File

@@ -3,7 +3,7 @@ whereibelong=$(pwd)
#echo "Brew installing xz..." #echo "Brew installing xz..."
#brew install xz > /dev/null #brew install xz > /dev/null
#brew upgrade brew upgrade
# prefer standard GNU tools like date over MacOS defaults # prefer standard GNU tools like date over MacOS defaults
export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
@@ -15,7 +15,7 @@ if [ ! -f python-$BUILD_PYTHON_VERSION-macosx10.9.pkg ]; then
fi fi
sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target / sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target /
#brew install openssl@1.1 brew install openssl@1.1
#brew upgrade python #brew upgrade python
export python=python3 export python=python3

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

@@ -14,6 +14,16 @@ export pip=/c/python/scripts/pip.exe
until [ -f $python ]; do :; done until [ -f $python ]; do :; done
until [ -f $pip ]; do :; done until [ -f $pip ]; do :; done
export exefile=Win32OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
if [ ! -e $exefile ]; then
echo "Downloading $exefile..."
wget --quiet https://slproweb.com/download/$exefile
fi
echo "Installing $exefile..."
powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"
until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/python/DLLs/libcrypto-1_1.dll; do echo "trying again..."; done
until cp -v /c/ssl/libssl-1_1-x64.dll /c/python/DLLs/libssl-1_1.dll; do echo "trying again..."; done
$pip install --upgrade pip $pip install --upgrade pip
$pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U
$pip install --upgrade -r src/requirements.txt $pip install --upgrade -r src/requirements.txt

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

@@ -2,21 +2,21 @@ echo "Installing Net-Framework-Core..."
export mypath=$(pwd) export mypath=$(pwd)
until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done
cd ~ cd ~
#export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
#if [ ! -e $exefile ]; then if [ ! -e $exefile ]; then
# echo "Downloading $exefile..." echo "Downloading $exefile..."
# wget --quiet https://slproweb.com/download/$exefile wget --quiet https://slproweb.com/download/$exefile
#fi fi
#echo "Installing $exefile..." echo "Installing $exefile..."
#powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl" powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"
#cup -y chocolatey #cup -y chocolatey
#cinst -y python3 #cinst -y python3
export python_file=python-$BUILD_PYTHON_VERSION-amd64.exe export python_file=python-$BUILD_PYTHON_VERSION-amd64.exe
wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file
powershell ".\\${python_file} /quiet InstallAllUsers=1 TargetDir=c:\\python" powershell ".\\${python_file} /quiet InstallAllUsers=1 TargetDir=c:\\python"
until cinst -y wixtoolset; do echo "trying again..."; done until cinst -y wixtoolset; do echo "trying again..."; done
#until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/Python37/DLLs/libcrypto-1_1.dll; do echo "trying again..."; done until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/python/DLLs/libcrypto-1_1.dll; do echo "trying again..."; done
#until cp -v /c/ssl/libssl-1_1-x64.dll /c/Python37/DLLs/libssl-1_1.dll; do echo "trying again..."; done until cp -v /c/ssl/libssl-1_1-x64.dll /c/python/DLLs/libssl-1_1.dll; do echo "trying again..."; done
export PATH=$PATH:/c/python/scripts export PATH=$PATH:/c/python/scripts
cd $mypath cd $mypath
export python=/c/python/python.exe export python=/c/python/python.exe