more travis work

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

View File

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

View File

@@ -13,10 +13,10 @@ cinst -y python3
until cinst -y wixtoolset; do echo "trying again..."; done
echo "OpenSSL dlls..."
ls -alRF /c/ssl
echo "c drive"
ls -al /c
sha1sum /c/ssl/*.dll
echo "Python dlls..."
ls -al /c/Python37/DLLs
sha1sum /c/Python37/DLLs
until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done
export PATH=$PATH:/c/Python37/scripts
cd $mypath

View File

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