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

more build fixes

Browse Source
This commit is contained in:
Jay Lee
2019-09-18 16:35:28 -04:00
parent 851bd1ef14
commit 28573b47a8
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,8 @@ sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target /
export python=python3 export python=python3
export pip=pip3 export pip=pip3
brew install openssl@1.1 > /dev/null
# Compile latest OpenSSL # Compile latest OpenSSL
#if [ ! -d openssl-$BUILD_OPENSSL_VERSION ]; then #if [ ! -d openssl-$BUILD_OPENSSL_VERSION ]; then
# wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz # wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz

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

@@ -20,11 +20,14 @@ ls -al /c/Python37/DLLs
until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done
export PATH=$PATH:/c/Python37/scripts export PATH=$PATH:/c/Python37/scripts
cd $mypath cd $mypath
pip install --upgrade pip export python=python
pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip install -U export pip=pip
pip install --upgrade -r src/requirements.txt
#pip install --upgrade pyinstaller $pip install --upgrade pip
$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 pyinstaller
# Install PyInstaller from source and build bootloader # Install PyInstaller from source and build bootloader
# to try and avoid getting flagged as malware since # to try and avoid getting flagged as malware since
# lots of malware uses PyInstaller default bootloader # lots of malware uses PyInstaller default bootloader
@@ -35,10 +38,10 @@ tar xf PyInstaller-$PYINSTALLER_VERSION.tar.gz
cd PyInstaller-$PYINSTALLER_VERSION/bootloader cd PyInstaller-$PYINSTALLER_VERSION/bootloader
echo "bootloader before:" echo "bootloader before:"
md5sum ../PyInstaller/bootloader/Windows-32bit/* md5sum ../PyInstaller/bootloader/Windows-32bit/*
/c/python37/python ./waf all --target-arch=32bit $python ./waf all --target-arch=32bit
echo "bootloader after:" echo "bootloader after:"
md5sum ../PyInstaller/bootloader/Windows-32bit/* md5sum ../PyInstaller/bootloader/Windows-32bit/*
echo "PATH: $PATH" echo "PATH: $PATH"
cd .. cd ..
/c/python37/python setup.py install $python setup.py install
cd $mypath cd $mypath

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

@@ -20,10 +20,13 @@ ls -al /c/Python37/DLLs
until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done
export PATH=$PATH:/c/Python37/scripts export PATH=$PATH:/c/Python37/scripts
cd $mypath cd $mypath
pip install --upgrade pip export python=python
pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip install -U export pip=pip
pip install --upgrade -r src/requirements.txt
#pip install --upgrade pyinstaller $pip install --upgrade pip
$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 pyinstaller
# Install PyInstaller from source and build bootloader # Install PyInstaller from source and build bootloader
# to try and avoid getting flagged as malware since # to try and avoid getting flagged as malware since
# lots of malware uses PyInstaller default bootloader # lots of malware uses PyInstaller default bootloader
@@ -34,10 +37,10 @@ tar xf PyInstaller-$PYINSTALLER_VERSION.tar.gz
cd PyInstaller-$PYINSTALLER_VERSION/bootloader cd PyInstaller-$PYINSTALLER_VERSION/bootloader
echo "bootloader before:" echo "bootloader before:"
md5sum ../PyInstaller/bootloader/Windows-64bit/* md5sum ../PyInstaller/bootloader/Windows-64bit/*
/c/python37/python ./waf all --target-arch=64bit $python ./waf all --target-arch=64bit
echo "bootloader after:" echo "bootloader after:"
md5sum ../PyInstaller/bootloader/Windows-64bit/* md5sum ../PyInstaller/bootloader/Windows-64bit/*
echo "PATH: $PATH" echo "PATH: $PATH"
cd .. cd ..
/c/python37/python setup.py install $python setup.py install
cd $mypath cd $mypath