unified build script

src/scripts/dobuild.ps1

@@ -5,18 +5,48 @@ param (
     [Parameter(Mandatory=$true)][string]$server
 )
 
-Write-Host -NoNewline "Copying files....."
+Write-Host "[Initializing]"
+Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-zec-qt-wallet-v$version.tar.gz
+Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-zec-qt-wallet-v$version.zip
+Remove-Item -Force -ErrorAction Ignore ./artifacts/zec-qt-wallet-v$version.deb
+Remove-Item -Force -ErrorAction Ignore ./artifacts/zec-qt-wallet-v$version.msi
+
+Remove-Item -Recurse -Force -ErrorAction Ignore ./bin
+Remove-Item -Recurse -Force -ErrorAction Ignore ./debug
+Remove-Item -Recurse -Force -ErrorAction Ignore ./release
+
+Write-Host -NoNewline "Copying files.........."
 ssh $server "rm -rf /tmp/zqwbuild"
 ssh $server "mkdir /tmp/zqwbuild"
 scp -r * ${server}:/tmp/zqwbuild | Out-Null
 ssh $server "dos2unix -q /tmp/zqwbuild/src/scripts/mkrelease.sh" | Out-Null
 Write-Host "[OK]"
 
-ssh $server "cd /tmp/zqwbuild && QT_STATIC=~/Qt/5.11.2/static/ ZCASH_DIR=~/github/zcash APP_VERSION=$version PREV_VERSION=$prev bash src/scripts/mkrelease.sh"
+ssh $server "cd /tmp/zqwbuild && APP_VERSION=$version PREV_VERSION=$prev bash src/scripts/mkrelease.sh"
 if (!$?) {
-    Write-Output "Build failed"
+    Write-Output "[Error]"
     exit 1;
 }
 
 New-Item artifacts -itemtype directory -Force | Out-Null
-scp ${server}:/tmp/zqwbuild/artifacts/* artifacts/ 
+scp ${server}:/tmp/zqwbuild/artifacts/* artifacts/ | Out-Null
+scp -r ${server}:/tmp/zqwbuild/release . | Out-Null
+
+Write-Host -NoNewline "Building Installer....."
+src/scripts/mkwininstaller.ps1 -version $version 2>&1 | Out-Null
+if (!$?) {
+    Write-Output "[Error]"
+    exit 1;
+}
+Write-Host "[OK]"
+
+# Finally, test to make sure all files exist
+Write-Host -NoNewline "Checking Build........."
+if (! (Test-Path ./artifacts/linux-zec-qt-wallet-v$version.tar.gz) -or
+    ! (Test-Path ./artifacts/Windows-zec-qt-wallet-v$version.zip) -or
+    ! (Test-Path ./artifacts/zec-qt-wallet-v$version.deb) -or
+    ! (Test-Path ./artifacts/zec-qt-wallet-v$version.msi)) {
+        Write-Host "[Error]"
+        exit 1;
+    }
+Write-Host "[OK]"

src/scripts/mkrelease.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 if [ -z $QT_STATIC ]; then 
     echo "QT_STATIC is not set. Please set it to the base directory of a statically compiled Qt"; 
     exit 1; 
@@ -23,7 +22,26 @@ if [ ! -f $ZCASH_DIR/artifacts/zcash-cli ]; then
     exit 1;
 fi
 
-echo -n "Version files....."
+# Ensure that zcashd is the right build
+echo -n "zcashd version........."
+if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/zcashd && ! readelf -s $ZCASH_DIR/artifacts/zcashd | grep -q "GLIBC_2\.25"; then 
+    echo "[OK]"
+else
+    echo "[ERROR]"
+    echo "zcashd doesn't seem to be a zqwMagicBean build or zcashd is built with libc 2.25"
+    exit 1
+fi
+
+echo -n "zcashd.exe version....."
+if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/zcashd.exe; then 
+    echo "[OK]"
+else
+    echo "[ERROR]"
+    echo "zcashd doesn't seem to be a zqwMagicBean build"
+    exit 1
+fi
+
+echo -n "Version files.........."
 # Replace the version number in the .pro file so it gets picked up everywhere
 sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zec-qt-wallet.pro > /dev/null
 
@@ -31,29 +49,29 @@ sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zec-qt-wallet.pro > /dev/null
 sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" README.md > /dev/null
 echo "[OK]"
 
-echo -n "Cleaning.........."
+echo -n "Cleaning..............."
 rm -rf bin/*
 rm -rf artifacts/*
 make distclean >/dev/null 2>&1
 echo "[OK]"
 
 echo ""
-echo "[Linux]"
+echo "[Linux " `lsb_release -r` "]"
 
-echo -n "Configuring......."
+echo -n "Configuring............"
 $QT_STATIC/bin/qmake zec-qt-wallet.pro -spec linux-clang CONFIG+=release > /dev/null
 #Mingw seems to have trouble with precompiled headers, so strip that option from the .pro file
 echo "[OK]"
 
 
-echo -n "Building.........."
+echo -n "Building..............."
 rm -rf bin/zec-qt-wallet* > /dev/null
 make -j$(nproc) > /dev/null
 echo "[OK]"
 
 
 # Test for Qt
-echo -n "Static link......."
+echo -n "Static link............"
 if [[ $(ldd zec-qt-wallet | grep -i "Qt") ]]; then
     echo "FOUND QT; ABORT"; 
     exit 1
@@ -61,7 +79,7 @@ fi
 echo "[OK]"
 
 
-echo -n "Packaging........."
+echo -n "Packaging.............."
 mkdir bin/zec-qt-wallet-v$APP_VERSION > /dev/null
 strip zec-qt-wallet
 cp zec-qt-wallet bin/zec-qt-wallet-v$APP_VERSION > /dev/null
@@ -77,7 +95,7 @@ echo "[OK]"
 
 
 if [ -f artifacts/linux-zec-qt-wallet-v$APP_VERSION.tar.gz ] ; then
-    echo -n "Package contents.."
+    echo -n "Package contents......."
     # Test if the package is built OK
     if tar tf "artifacts/linux-zec-qt-wallet-v$APP_VERSION.tar.gz" | wc -l | grep -q "6"; then 
         echo "[OK]"
@@ -90,7 +108,7 @@ else
     exit 1
 fi
 
-echo -n "Building deb......"
+echo -n "Building deb..........."
 debdir=bin/deb/zec-qt-wallet-v$APP_VERSION
 mkdir -p $debdir > /dev/null
 mkdir $debdir/DEBIAN
@@ -135,7 +153,7 @@ fi
 
 export PATH=$MXE_PATH:$PATH
 
-echo -n "Configuring......."
+echo -n "Configuring............"
 make clean  > /dev/null
 rm -f zec-qt-wallet-mingw.pro
 rm -rf release/
@@ -144,16 +162,16 @@ cat zec-qt-wallet.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED
 echo "[OK]"
 
 
-echo -n "Building.........."
+echo -n "Building..............."
 x86_64-w64-mingw32.static-qmake-qt5 zec-qt-wallet-mingw.pro CONFIG+=release > /dev/null
 make -j32 > /dev/null
 echo "[OK]"
 
 
-echo -n "Packaging........."
+echo -n "Packaging.............."
 mkdir release/zec-qt-wallet-v$APP_VERSION  
 cp release/zec-qt-wallet.exe release/zec-qt-wallet-v$APP_VERSION 
-cp $ZCASH_DIR/zcashd.exe release/zec-qt-wallet-v$APP_VERSION > /dev/null
+cp $ZCASH_DIR/artifacts/zcashd.exe release/zec-qt-wallet-v$APP_VERSION > /dev/null
 cp $ZCASH_DIR/artifacts/zcash-cli.exe release/zec-qt-wallet-v$APP_VERSION > /dev/null
 cp README.md release/zec-qt-wallet-v$APP_VERSION 
 cp LICENSE release/zec-qt-wallet-v$APP_VERSION 
@@ -164,7 +182,7 @@ cp release/Windows-zec-qt-wallet-v$APP_VERSION.zip ./artifacts/
 echo "[OK]"
 
 if [ -f artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip ] ; then
-    echo -n "Package contents.."
+    echo -n "Package contents......."
     if unzip -l "artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip" | wc -l | grep -q "11"; then 
         echo "[OK]"
     else
@@ -176,7 +194,3 @@ else
     echo "[ERROR]"
     exit 1
 fi
-
-echo ""
-echo "Build is artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip"
-echo "Build is artifacts/linux-zec-qt-wallet-v$APP_VERSION.tar.gz"

src/scripts/mkwininstaller.ps1

@@ -1,11 +1,9 @@
-if (-not (Test-Path env:APP_VERSION)) { 
+param (
-    echo "APP_VERSION is not set. Please set it to the version you want to build"; 
+    [Parameter(Mandatory=$true)][string]$version
-    echo '$Env:APP_VERSION = "0.3.0"'
+)
-    exit; 
+
-}
+$target="zec-qt-wallet-v$version"
-$target="zec-qt-wallet-v$Env:APP_VERSION"
 
-echo "Building Installer"
 Remove-Item -Path release/wininstaller -Recurse | Out-Null
 New-Item release/wininstaller -itemtype directory | Out-Null
 
@@ -15,10 +13,17 @@ Copy-Item release/$target/README.md release/wininstaller/
 Copy-Item release/$target/zcashd.exe release/wininstaller/
 Copy-Item release/$target/zcash-cli.exe release/wininstaller/
 
-cat src/scripts/zec-qt-wallet.wxs | % { $_ -replace "RELEASE_VERSION", "$Env:APP_VERSION" } > release/wininstaller/zec-qt-wallet.wxs
+cat src/scripts/zec-qt-wallet.wxs | % { $_ -replace "RELEASE_VERSION", "$version" } > release/wininstaller/zec-qt-wallet.wxs
 
 candle.exe release/wininstaller/zec-qt-wallet.wxs -o release/wininstaller/zec-qt-wallet.wixobj 
+if (!$?) {
+    exit 1;
+}
+
 light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/zec-qt-wallet.wixobj -out release/wininstaller/zec-qt-wallet.msi 
+if (!$?) {
+    exit 1;
+}
 
 New-Item artifacts -itemtype directory -Force | Out-Null
 Copy-Item release/wininstaller/zec-qt-wallet.msi ./artifacts/$target.msi