From 87fa70be2cfdd8c2cf15645465079734a5508e61 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 27 Sep 2019 13:40:41 -0400 Subject: [PATCH] travis --- src/travis/osx-x86_64-before-install.sh | 4 +--- src/travis/windows-x86_64-before-install.sh | 9 ++------- src/travis/windows-x86_64-install.sh | 1 - 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/travis/osx-x86_64-before-install.sh b/src/travis/osx-x86_64-before-install.sh index edfece62..8f30666d 100755 --- a/src/travis/osx-x86_64-before-install.sh +++ b/src/travis/osx-x86_64-before-install.sh @@ -21,9 +21,7 @@ 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/opt -ls -al /usr/local/opt/python -ls -al /usr/local/opt/python/lib +ls -alRF /usr/local/opt/python # 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 db5fb2eb..881e7f13 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -11,13 +11,8 @@ echo "Installing $exefile..." powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl" cinst -y python3 until cinst -y wixtoolset; do echo "trying again..."; done -echo "OpenSSL dlls..." -ls -alRF /c/ssl -sha1sum /c/ssl/*.dll -echo "Python dlls..." -ls -al /c/Python37/DLLs -sha1sum /c/Python37/DLLs/*.dll -until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done +until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/Python37/DLLs/libcrypto-1_1.dll; do echo "trying again..."; done +until cp -v /c/ssl/libssl-1_1-x64.dll /c/Python37/DLLs/libssl-1_1.dll; do echo "trying again..."; done export PATH=$PATH:/c/Python37/scripts cd $mypath export python=/c/Python37/python.exe diff --git a/src/travis/windows-x86_64-install.sh b/src/travis/windows-x86_64-install.sh index 4626b249..2f9023f0 100755 --- a/src/travis/windows-x86_64-install.sh +++ b/src/travis/windows-x86_64-install.sh @@ -1,5 +1,4 @@ cd src -sha1sum /c/Python37/DLLs/*.dll pyinstaller --clean --noupx -F --distpath=gam $GAMOS-gam.spec export gam="gam/gam" export gampath=$(readlink -e gam)