From a8c1051e0f81dc967d1abf0f84db90efbc0b12d8 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Fri, 27 Sep 2019 11:43:27 -0400
Subject: [PATCH] more travis work

---
 src/travis/linux-x86_64-before-install.sh   | 10 +++++-----
 src/travis/windows-x86_64-before-install.sh |  4 ++--
 src/travis/windows-x86_64-install.sh        |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh
index 3efd2476..d6a0b74e 100755
--- a/src/travis/linux-x86_64-before-install.sh
+++ b/src/travis/linux-x86_64-before-install.sh
@@ -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..."
diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh
index b27f2c1c..4c2b88ae 100755
--- a/src/travis/windows-x86_64-before-install.sh
+++ b/src/travis/windows-x86_64-before-install.sh
@@ -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
diff --git a/src/travis/windows-x86_64-install.sh b/src/travis/windows-x86_64-install.sh
index 2f9023f0..43ed8b07 100755
--- a/src/travis/windows-x86_64-install.sh
+++ b/src/travis/windows-x86_64-install.sh
@@ -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)