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 travis work

Browse Source
This commit is contained in:
Jay Lee
2019-09-27 11:43:27 -04:00
parent d7ba12e729
commit a8c1051e0f
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/travis/linux-x86_64-before-install.sh
View File

@@ -66,14 +66,14 @@ else
echo "running configure with safe and unsafe" echo "running configure with safe and unsafe"
./configure $safe_flags $unsafe_flags > /dev/null ./configure $safe_flags $unsafe_flags > /dev/null
fi fi
timeout 1800 make -j$cpucount -s make -j$cpucount -s
RESULT=$? RESULT=$?
echo "First make exited with $RESULT" echo "First make exited with $RESULT"
if [ $RESULT != 0 ]; then if [ $RESULT != 0 ]; then
#echo "Trying Python compile again without unsafe flags..." echo "Trying Python compile again without unsafe flags..."
#make clean make clean
#./configure $safe_flags > /dev/null ./configure $safe_flags > /dev/null
#make -j$cpucount -s make -j$cpucount -s
echo "Sticking with safe Python for now..." echo "Sticking with safe Python for now..."
else else
echo "Installing optimized Python..." echo "Installing optimized Python..."

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

@@ -13,10 +13,10 @@ cinst -y python3
until cinst -y wixtoolset; do echo "trying again..."; done until cinst -y wixtoolset; do echo "trying again..."; done
echo "OpenSSL dlls..." echo "OpenSSL dlls..."
ls -alRF /c/ssl ls -alRF /c/ssl
echo "c drive" sha1sum /c/ssl/*.dll
ls -al /c
echo "Python dlls..." echo "Python dlls..."
ls -al /c/Python37/DLLs ls -al /c/Python37/DLLs
sha1sum /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

1
src/travis/windows-x86_64-install.sh
View File

@@ -1,4 +1,5 @@
cd src cd src
sha1sum /c/Python37/DLLs
pyinstaller --clean --noupx -F --distpath=gam $GAMOS-gam.spec pyinstaller --clean --noupx -F --distpath=gam $GAMOS-gam.spec
export gam="gam/gam" export gam="gam/gam"
export gampath=$(readlink -e gam) export gampath=$(readlink -e gam)