Tweaks to windows installer

src/mainwindow.cpp

@@ -641,6 +641,10 @@ void MainWindow::importPrivKey() {
     }
 }
 
+/**
+ * Backup the wallet.dat file. This is kind of a hack, since it has to read from the filesystem rather than an RPC call
+ * This might fail for various reasons - Remote zcashd, non-standard locations, custom params passed to zcashd, many others
+*/
 void MainWindow::backupWalletDat() {
     QDir zcashdir(rpc->getConnection()->config->zcashDir);
     QString backupDefaultName = "zcash-wallet-backup-" + QDateTime::currentDateTime().toString("yyyyMMdd") + ".dat";

src/scripts/dobuild.ps1

@@ -11,24 +11,27 @@ Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-zec-qt-wallet-v$version
 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 -Force -ErrorAction Ignore ./artifacts/macOS-zec-qt-wallet-v$version.dmg
 
 Remove-Item -Recurse -Force -ErrorAction Ignore ./bin
 Remove-Item -Recurse -Force -ErrorAction Ignore ./debug
 Remove-Item -Recurse -Force -ErrorAction Ignore ./release
 
 # Create the version.h file
-echo "#define APP_VERSION `"$version`"" > src/version.h
-echo ""
+Write-Output "#define APP_VERSION `"$version`"" > src/version.h
+Write-Host ""
 
 
-echo "[Building on Mac]"
+Write-Host "[Building on Mac]"
 Write-Host -NoNewline "Copying files.........."
 ssh $macserver "rm -rf /tmp/zqwbuild"
 ssh $macserver "mkdir /tmp/zqwbuild"
-scp -r * ${macserver}:/tmp/zqwbuild | Out-Null
+scp -r src/ res/ ./zec-qt-wallet.pro ./application.qrc ./LICENSE ./README.md ${macserver}:/tmp/zqwbuild/ | Out-Null
 Write-Host "[OK]"
+ssh $macserver "cd /tmp/zqwbuild && /usr/local/bin/dos2unix -q src/scripts/mkmacdmg.sh"
+ssh $macserver "cd /tmp/zqwbuild && /usr/local/bin/dos2unix -q src/version.h"
 ssh $macserver "cd /tmp/zqwbuild && APP_VERSION=$version QT_PATH=~/Qt/5.11.2/clang_64/ ZCASH_DIR=~/github/zcash bash src/scripts/mkmacdmg.sh"
-if (!$?) {
+if (! $?) {
     Write-Output "[Error]"
     exit 1;
 }
@@ -37,12 +40,13 @@ scp ${macserver}:/tmp/zqwbuild/artifacts/* artifacts/ | Out-Null
 Write-Host ""
 
 
-echo "[Building Linux/Windows]"
+Write-Host "[Building Linux + Windows]"
 Write-Host -NoNewline "Copying files.........."
 ssh $server "rm -rf /tmp/zqwbuild"
 ssh $server "mkdir /tmp/zqwbuild"
-scp -r * ${server}:/tmp/zqwbuild | Out-Null
+scp -r src/ res/ ./zec-qt-wallet.pro ./application.qrc ./LICENSE ./README.md ${server}:/tmp/zqwbuild/ | Out-Null
 ssh $server "dos2unix -q /tmp/zqwbuild/src/scripts/mkrelease.sh" | Out-Null
+ssh $server "dos2unix -q /tmp/zqwbuild/src/version.h"
 Write-Host "[OK]"
 
 ssh $server "cd /tmp/zqwbuild && APP_VERSION=$version PREV_VERSION=$prev bash src/scripts/mkrelease.sh"
@@ -69,7 +73,7 @@ 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) -or 
-    ! (Test-Path ./artifacts/zec-qt-wallet-v$version.dmg) ) {
+    ! (Test-Path ./artifacts/macOS-zec-qt-wallet-v$version.dmg) ) {
         Write-Host "[Error]"
         exit 1;
     }

src/scripts/mkmacdmg.sh

@@ -6,7 +6,7 @@ if [ -z $QT_PATH ]; then
 fi
 
 if [ -z $ZCASH_DIR ]; then
-    echo "ZCASH_PATH is not set. Please set it to the base directory of a compiled zcashd";
+    echo "ZCASH_DIR is not set. Please set it to the base directory of a compiled zcashd";
     exit 1;
 fi
 
@@ -56,7 +56,7 @@ cp res/dmgbg.png bin/dmgbuild/
 cp -r zec-qt-wallet.app bin/dmgbuild/
 
 appdmg --quiet bin/dmgbuild/appdmg.json artifacts/macOS-zec-qt-wallet-v$APP_VERSION.dmg >/dev/null
-if [ ! -f artifacts/zec-qt-wallet-v$APP_VERSION.dmg ]; then
+if [ ! -f artifacts/macOS-zec-qt-wallet-v$APP_VERSION.dmg ]; then
     echo "[ERROR]"
     exit 1
 fi

src/scripts/mkrelease.sh

@@ -56,7 +56,7 @@ make distclean >/dev/null 2>&1
 echo "[OK]"
 
 echo ""
-echo "[Building on" `lsb_release -r` "]"
+echo "[Building on" `lsb_release -r`"]"
 
 echo -n "Configuring............"
 $QT_STATIC/bin/qmake zec-qt-wallet.pro -spec linux-clang CONFIG+=release > /dev/null

src/scripts/mkwininstaller.ps1

@@ -13,7 +13,7 @@ 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", "$version" } > release/wininstaller/zec-qt-wallet.wxs
+Get-Content src/scripts/zec-qt-wallet.wxs | ForEach-Object { $_ -replace "RELEASE_VERSION", "$version" } | Out-File -Encoding utf8 release/wininstaller/zec-qt-wallet.wxs
 
 candle.exe release/wininstaller/zec-qt-wallet.wxs -o release/wininstaller/zec-qt-wallet.wixobj 
 if (!$?) {

src/scripts/zec-qt-wallet.wxs

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="*" Name="zec-qt-wallet vRELEASE_VERSION" Language="1033" Version="RELEASE_VERSION" Manufacturer="zec-qt-wallet-org" UpgradeCode="fb9bf166-b55f-46b5-a990-9189bdf64533">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
@@ -10,7 +10,7 @@
         <Property Id="ARPPRODUCTICON" Value="icon.ico" />
 
 		<Feature Id="ProductFeature" Title="zec-qt-wallet" Level="1">
-			<ComponentGroupRef Id="ProductComponents" />
+			<ComponentGroupRef Id="ProductComponents" /> 
             <ComponentRef Id="ProgramMenuDir"/>
 		</Feature>