From 4536cd13ef1ab303ab13433b6134bb169738db5b Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 17 May 2019 17:27:14 -0400 Subject: [PATCH] MainInstaller sub-folder --- src/travis/windows-x86-before-install.sh | 4 ++-- src/travis/windows-x86_64-before-install.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh index df3b0113..d09817ec 100755 --- a/src/travis/windows-x86-before-install.sh +++ b/src/travis/windows-x86-before-install.sh @@ -11,10 +11,10 @@ if [ ! -e ssl/libeay32.dll ]; then /c/Program\ Files/7-Zip/7z.exe e $msifile -ossl fi echo "OpenSSL dlls..." -ls -al ssl +ls -alRF ssl echo "Python dlls..." ls -al /c/Python37/DLLs -cp -v ssl/*.dll /c/Python37/DLLs +cp -v ssl/MainInstaller/*.dll /c/Python37/DLLs export PATH=$PATH:/c/Python37/scripts until cinst -y wixtoolset; do echo "trying again..."; done cd ~ diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index d3876215..49d92ec6 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -11,10 +11,10 @@ if [ ! -e ssl/libeay32.dll ]; then /c/Program\ Files/7-Zip/7z.exe e $msifile -ossl fi echo "OpenSSL dlls..." -ls -al ssl +ls -alRF ssl echo "Python dlls..." ls -al /c/Python37/DLLs -cp -v /c/Program\ Files/OpenSSL/bin/*.dll /c/Python37/DLLs +cp -v ssl/MainInstaller/*.dll /c/Python37/DLLs export PATH=$PATH:/c/Python37/scripts until cinst -y wixtoolset; do echo "trying again..."; done cd ~