merge manually

2019-11-19 13:39:49 +01:00
parent 9283062dbd d81fac8b08
commit 1f1a93006c
26 changed files with 196 additions and 165 deletions
--- a/src/scripts/dounifiedbuild.ps1
+++ b/src/scripts/dounifiedbuild.ps1
@@ -2,16 +2,17 @@
 param (
    [Parameter(Mandatory=$true)][string]$version,
    [Parameter(Mandatory=$true)][string]$prev,
+    [Parameter(Mandatory=$true)][string]$certificate,
    [Parameter(Mandatory=$true)][string]$server,
    [Parameter(Mandatory=$true)][string]$winserver
 )

 Write-Host "[Initializing]"
-Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-binaries-silentdragon-v$version.tar.gz
-Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-deb-silentdragon-v$version.deb
-Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-silentdragon-v$version.zip
-Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-silentdragon-v$version.msi
-Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-silentdragon-v$version.dmg
+Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-binaries-SilentDragonLite-v$version.tar.gz
+Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-deb-SilentDragonLite-v$version.deb
+Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-SilentDragonLite-v$version.zip
+Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-SilentDragonLite-v$version.msi
+Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-SilentDragonLite-v$version.dmg
 Remove-Item -Force -ErrorAction Ignore ./artifacts/signatures-v$version.tar.gz


@@ -27,7 +28,7 @@ Write-Host ""


 Write-Host "[Building on Mac]"
-bash src/scripts/mkmacdmg.sh --qt_path ~/Qt/5.11.1/clang_64/ --version $version --hush_path ~/prod/hush 
+bash src/scripts/mkmacdmg.sh --qt_path ~/Qt/5.11.1/clang_64/ --version $version --certificate "$certificate"
 if (! $?) {
    Write-Output "[Error]"
    exit 1;
@@ -37,9 +38,11 @@ Write-Host ""

 Write-Host "[Building Linux + Windows]"
 Write-Host -NoNewline "Copying files.........."
+# Cleanup some local files to aid copying
+rm -rf lib/target/
 ssh $server "rm -rf /tmp/zqwbuild"
 ssh $server "mkdir /tmp/zqwbuild"
-scp -r src/ singleapplication/ res/ ./silentdragonlite.pro ./application.qrc ./LICENSE ./README.md ${server}:/tmp/zqwbuild/ | Out-Null
+scp -r src/ singleapplication/ res/ ./silentdragon-lite.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]"
@@ -86,11 +89,11 @@ Write-Host "[OK]"

 # Finally, test to make sure all files exist
 Write-Host -NoNewline "Checking Build........."
-if (! (Test-Path ./artifacts/linux-binaries-silentdragon-v$version.tar.gz) -or
-    ! (Test-Path ./artifacts/linux-deb-silentdragon-v$version.deb) -or
-    ! (Test-Path ./artifacts/Windows-binaries-silentdragon-v$version.zip) -or
-    ! (Test-Path ./artifacts/macOS-silentdragon-v$version.dmg) -or 
-    ! (Test-Path ./artifacts/Windows-installer-silentdragon-v$version.msi) ) {
+if (! (Test-Path ./artifacts/linux-binaries-SilentDragonLite-v$version.tar.gz) -or
+    ! (Test-Path ./artifacts/linux-deb-SilentDragonLite-v$version.deb) -or
+    ! (Test-Path ./artifacts/Windows-binaries-SilentDragonLite-v$version.zip) -or
+    ! (Test-Path ./artifacts/macOS-SilentDragonLite-v$version.dmg) -or 
+    ! (Test-Path ./artifacts/Windows-installer-SilentDragonLite-v$version.msi) ) {
        Write-Host "[Error]"
        exit 1;
    }
--- a/src/scripts/mkmacdmg.sh
+++ b/src/scripts/mkmacdmg.sh
@@ -12,8 +12,8 @@ case $key in
    shift # past argument
    shift # past value
    ;;
-    -z|--hush_path)
-    hush_DIR="$2"
+    -c|--certificate)
+    CERTIFICATE="$2"
    shift # past argument
    shift # past value
    ;;
@@ -35,6 +35,11 @@ if [ -z $QT_PATH ]; then
    exit 1; 
 fi

+if [ -z $CERTIFICATE ]; then 
+    echo "CERTIFICATE is not set. Please set it the name of the MacOS developer certificate to sign the binary with"; 
+    exit 1; 
+fi
+
 if [ -z $APP_VERSION ]; then
    echo "APP_VERSION is not set. Please set it to the current release version of the app";
    exit 1;
@@ -70,7 +75,8 @@ echo -n "Deploying.............."
 mkdir artifacts >/dev/null 2>&1
 rm -f artifcats/Silentdragonlite.dmg >/dev/null 2>&1
 rm -f artifacts/rw* >/dev/null 2>&1
-$QT_PATH/bin/macdeployqt Silentdragonlite.app 
+$QT_PATH/bin/macdeployqt SilentDragonLite.app 
+codesign --deep --force --verify --verbose -s "$CERTIFICATE" --options runtime --timestamp SilentDragonLite.app/
 echo "[OK]"


--- a/src/scripts/mkwininstaller.ps1
+++ b/src/scripts/mkwininstaller.ps1
@@ -2,16 +2,13 @@ param (
    [Parameter(Mandatory=$true)][string]$version
 )

-$target="silentdragon-v$version"
+$target="SilentDragonLite-v$version"

 Remove-Item -Path release/wininstaller -Recurse -ErrorAction Ignore  | Out-Null
 New-Item release/wininstaller -itemtype directory                    | Out-Null

-Copy-Item release/$target/silentdragon.exe     release/wininstaller/
-Copy-Item release/$target/LICENSE           release/wininstaller/
-Copy-Item release/$target/README.md         release/wininstaller/
-Copy-Item release/$target/hushd.exe        release/wininstaller/
-Copy-Item release/$target/hush-cli.exe     release/wininstaller/
+Copy-Item release/$target/SilentDragonLite.exe     release/wininstaller/
+Copy-Item release/$target/LICENSE                  release/wininstaller/

 Get-Content src/scripts/silentdragonlite.wxs | ForEach-Object { $_ -replace "RELEASE_VERSION", "$version" } | Out-File -Encoding utf8 release/wininstaller/silentdragonlite.wxs

@@ -20,10 +17,10 @@ if (!$?) {
    exit 1;
 }

-light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/silentdragonlite.wixobj -out release/wininstaller/silentdragon.msi 
+light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/SilentDragonLite.wixobj -out release/wininstaller/SilentDragonLite.msi 
 if (!$?) {
    exit 1;
 }

 New-Item artifacts -itemtype directory -Force | Out-Null
-Copy-Item release/wininstaller/silentdragon.msi ./artifacts/Windows-installer-$target.msi
+Copy-Item release/wininstaller/SilentDragonLite.msi ./artifacts/Windows-installer-$target.msi
--- a/src/scripts/signbinaries.sh
+++ b/src/scripts/signbinaries.sh
@@ -35,7 +35,7 @@ rm -f signatures-v$APP_VERSION.tar.gz
 # sha256sum the binaries
 gsha256sum *$APP_VERSION* > sha256sum-v$APP_VERSION.txt

-for i in $( ls *silentdragon-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do
+for i in $( ls *SilentDragonLite-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do
  echo "Signing" $i
  gpg --batch --output ../release/signatures/$i.sig --detach-sig $i 
 done
--- a/src/scripts/zec-qt-wallet.wxs
+++ b/src/scripts/zec-qt-wallet.wxs
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="silentdragon vRELEASE_VERSION" Language="1033" Version="RELEASE_VERSION" Manufacturer="silentdragonlite-org" UpgradeCode="fb9bf166-b55f-46b5-a990-9189bdf64533">
+	<Product Id="*" Name="SilentDragonLite vRELEASE_VERSION" Language="1033" Version="RELEASE_VERSION" Manufacturer="silentdragonlite-org" UpgradeCode="fb9bf166-b55f-46b5-a990-9189bdf64533">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />

 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 		<MediaTemplate EmbedCab="yes"/>

-        <Icon Id="silentdragonlite.exe" SourceFile="res/icon.ico"/>
-        <Property Id="ARPPRODUCTICON" Value="silentdragonlite.exe" />
+        <Icon Id="SilentDragonLite.exe" SourceFile="res/icon.ico"/>
+        <Property Id="ARPPRODUCTICON" Value="SilentDragonLite.exe" />

 		<Feature Id="ProductFeature" Title="silentdragonlite" Level="1">
 			<ComponentGroupRef Id="ProductComponents" /> 
@@ -55,24 +55,21 @@
 	<Fragment>
 		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
 			<Component Id="ProductComponent" Guid="0D210F5A-53E0-4E7E-CAAD-15A26995505E">
-                <File Source="silentdragon.exe" KeyPath="yes">
+                <File Source="SilentDragonLite.exe" KeyPath="yes">
                    <Shortcut Id="startMenuShotcut" Advertise="yes" Directory="ApplicationProgramsFolder"
-                        Name="silentdragon" WorkingDirectory="INSTALLFOLDER" Icon="silentdragonlite.exe" >
+                        Name="SilentDragonLite" WorkingDirectory="INSTALLFOLDER" Icon="SilentDragonLite.exe" >
                    </Shortcut>
                </File>
                <File Source="LICENSE" />
-                <File Source="hushd.exe" />
-                <File Source="hush-cli.exe" />
-                <File Source="README.md" />

                <RegistryKey Root="HKCR" Key="hush">
                    <RegistryValue Type="string" Name="URL Protocol" Value=""/>
                    <RegistryValue Type="string" Value="URL:hush URI protocol"/>
                    <RegistryKey Key="DefaultIcon">
-                    <RegistryValue Type="string" Value="silentdragon.exe" />
+                    <RegistryValue Type="string" Value="SilentDragonLite.exe" />
                    </RegistryKey>
                    <RegistryKey Key="shell\open\command">
-                    <RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]silentdragon.exe&quot; &quot;%1&quot;" />
+                    <RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]SilentDragonLite.exe&quot; &quot;%1&quot;" />
                    </RegistryKey>
                </RegistryKey>
 			</Component>