From c40785ce28efaa834597ae06bfe57a9e233aedc4 Mon Sep 17 00:00:00 2001 From: bdr Date: Tue, 16 Oct 2018 21:00:47 -0700 Subject: [PATCH] fix build scripts --- src/scripts/mkrelease.sh | 11 +++++------ src/scripts/mkwinrelease.ps1 | 7 ++++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh index 5208a5b..cae8c2e 100755 --- a/src/scripts/mkrelease.sh +++ b/src/scripts/mkrelease.sh @@ -19,15 +19,14 @@ echo "Building" rm -rf bin/zcash-qt-wallet* > /dev/null make -j$(nproc) > /dev/null +# Test for Qt +echo "Testing for no Qt" -# Test for QT -echo "Testing for no QT" - -if [[ $(ldd zcash-qt-wallet | grep -i "QT") ]]; then +if [[ $(ldd zcash-qt-wallet | grep -i "Qt") ]]; then echo "FOUND QT; ABORT"; exit 1 else - echo "No QT found" + echo "No Qt found" fi echo "Packaging" @@ -37,4 +36,4 @@ cp README.md bin/zcash-qt-wallet-v$APP_VERSION > /dev/null cp LICENSE bin/zcash-qt-wallet-v$APP_VERSION > /dev/null cd bin && tar cvf zcash-qt-wallet-v$APP_VERSION.tar.gz zcash-qt-wallet-v$APP_VERSION/ > /dev/null -echo "Done" +echo "Done" \ No newline at end of file diff --git a/src/scripts/mkwinrelease.ps1 b/src/scripts/mkwinrelease.ps1 index 5ac5913..6bca465 100644 --- a/src/scripts/mkwinrelease.ps1 +++ b/src/scripts/mkwinrelease.ps1 @@ -18,7 +18,12 @@ nmake *>$null New-Item release/$target -itemtype directory | Out-Null Move-Item release/zcash-qt-wallet.exe release/$target | Out-Null +echo "Copying" & "$Env:QT_STATIC\bin\windeployqt.exe" release/$target/zcash-qt-wallet.exe *>$null +Copy-Item LICENSE release/$target | Out-Null +Copy-Item README.md release/$target | Out-Null echo "Zipping" -Compress-Archive -LiteralPath release/$target -DestinationPath "release/$target.zip" \ No newline at end of file +Compress-Archive -LiteralPath release/$target -DestinationPath "release/$target.zip" + +echo "Done" \ No newline at end of file