diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh index d6a0b74e..0ee9ef80 100755 --- a/src/travis/linux-x86_64-before-install.sh +++ b/src/travis/linux-x86_64-before-install.sh @@ -75,10 +75,9 @@ else ./configure $safe_flags > /dev/null make -j$cpucount -s echo "Sticking with safe Python for now..." - else - echo "Installing optimized Python..." - make install > /dev/null fi + echo "Installing Python..." + make install > /dev/null cd ~ export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib diff --git a/src/travis/osx-x86_64-before-install.sh b/src/travis/osx-x86_64-before-install.sh index f2d9ea3a..edfece62 100755 --- a/src/travis/osx-x86_64-before-install.sh +++ b/src/travis/osx-x86_64-before-install.sh @@ -14,14 +14,16 @@ sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target / export python=python3 export pip=pip3 -echo "PYthon location:" +echo "Python location:" which $python brew install openssl@1.1 > /dev/null brew info openssl@1.1 echo "OpenSSL Lib" ls -al /usr/local/opt/openssl@1.1/lib echo "Local Python Lib" -ls -al /usr/local/lib/python3.7 +ls -al /usr/local/opt +ls -al /usr/local/opt/python +ls -al /usr/local/opt/python/lib # Compile latest OpenSSL #if [ ! -d openssl-$BUILD_OPENSSL_VERSION ]; then diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index 4c2b88ae..db5fb2eb 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -16,7 +16,7 @@ ls -alRF /c/ssl sha1sum /c/ssl/*.dll echo "Python dlls..." ls -al /c/Python37/DLLs -sha1sum /c/Python37/DLLs +sha1sum /c/Python37/DLLs/*.dll 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 43ed8b07..4626b249 100755 --- a/src/travis/windows-x86_64-install.sh +++ b/src/travis/windows-x86_64-install.sh @@ -1,5 +1,5 @@ cd src -sha1sum /c/Python37/DLLs +sha1sum /c/Python37/DLLs/*.dll pyinstaller --clean --noupx -F --distpath=gam $GAMOS-gam.spec export gam="gam/gam" export gampath=$(readlink -e gam)