hush
/
SilentDragonLite
9
1
Fork 4
Code Issues 37 Pull Requests Projects Releases 8 Wiki Activity
Browse Source

Fix unified build

pull/25/head^2
Aditya Kulkarni 5 years ago
parent
8bf0552efa
commit
abf488b200
5 changed files with 34 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      res/Info.plist
  2. 26
      src/scripts/dounifiedbuild.ps1
  3. 13
      src/scripts/mkwininstaller.ps1
  4. 2
      src/scripts/signbinaries.sh
  5. 27
      src/scripts/zec-qt-wallet.wxs

4
res/Info.plist
View File

@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string>logo.icns</string>
<key>CFBundleIdentifier</key>
<string>com.yourcompany.zecwallet</string>
<string>com.yourcompany.zecwallet-lite</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
@ -39,4 +39,4 @@
<key>NSUIElement</key>
<true/>
</dict>
</plist>
</plist>

26
src/scripts/dounifiedbuild.ps1
View File

@ -7,11 +7,11 @@ param (
)
Write-Host "[Initializing]"
Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-binaries-zecwallet-v$version.tar.gz
Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-deb-zecwallet-v$version.deb
Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-zecwallet-v$version.zip
Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-zecwallet-v$version.msi
Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-zecwallet-v$version.dmg
Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-binaries-zecwallet-lite-v$version.tar.gz
Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-deb-zecwallet-lite-v$version.deb
Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-lite-zecwallet-v$version.zip
Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-lite-zecwallet-v$version.msi
Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-zecwallet--litev$version.dmg
Remove-Item -Force -ErrorAction Ignore ./artifacts/signatures-v$version.tar.gz
@ -27,7 +27,7 @@ Write-Host ""
Write-Host "[Building on Mac]"
bash src/scripts/mkmacdmg.sh --qt_path ~/Qt/5.11.1/clang_64/ --version $version --zcash_path ~/prod/zcash
bash src/scripts/mkmacdmg.sh --qt_path ~/Qt/5.11.1/clang_64/ --version $version
if (! $?) {
Write-Output "[Error]"
exit 1;
@ -37,9 +37,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/ ./zec-qt-wallet.pro ./application.qrc ./LICENSE ./README.md ${server}:/tmp/zqwbuild/ | Out-Null
scp -r src/ singleapplication/ res/ lib/ ./zecwallet-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 +88,11 @@ Write-Host "[OK]"
# Finally, test to make sure all files exist
Write-Host -NoNewline "Checking Build........."
if (! (Test-Path ./artifacts/linux-binaries-zecwallet-v$version.tar.gz) -or
! (Test-Path ./artifacts/linux-deb-zecwallet-v$version.deb) -or
! (Test-Path ./artifacts/Windows-binaries-zecwallet-v$version.zip) -or
! (Test-Path ./artifacts/macOS-zecwallet-v$version.dmg) -or
! (Test-Path ./artifacts/Windows-installer-zecwallet-v$version.msi) ) {
if (! (Test-Path ./artifacts/linux-binaries-zecwallet-lite-v$version.tar.gz) -or
! (Test-Path ./artifacts/linux-deb-zecwallet-lite-v$version.deb) -or
! (Test-Path ./artifacts/Windows-binaries-zecwallet-lite-v$version.zip) -or
! (Test-Path ./artifacts/macOS-zecwallet-lite-v$version.dmg) -or
! (Test-Path ./artifacts/Windows-installer-zecwallet-lite-v$version.msi) ) {
Write-Host "[Error]"
exit 1;
}

13
src/scripts/mkwininstaller.ps1
View File

@ -2,16 +2,13 @@ param (
[Parameter(Mandatory=$true)][string]$version
)
$target="zecwallet-v$version"
$target="zecwallet-lite-v$version"
Remove-Item -Path release/wininstaller -Recurse -ErrorAction Ignore | Out-Null
New-Item release/wininstaller -itemtype directory | Out-Null
Copy-Item release/$target/zecwallet.exe release/wininstaller/
Copy-Item release/$target/LICENSE release/wininstaller/
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/
Copy-Item release/$target/zecwallet-lite.exe release/wininstaller/
Copy-Item release/$target/LICENSE release/wininstaller/
Get-Content src/scripts/zec-qt-wallet.wxs | ForEach-Object { $_ -replace "RELEASE_VERSION", "$version" } | Out-File -Encoding utf8 release/wininstaller/zec-qt-wallet.wxs
@ -20,10 +17,10 @@ if (!$?) {
exit 1;
}
light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/zec-qt-wallet.wixobj -out release/wininstaller/zecwallet.msi
light.exe -ext WixUIExtension -cultures:en-us release/wininstaller/zec-qt-wallet.wixobj -out release/wininstaller/zecwallet-lite.msi
if (!$?) {
exit 1;
}
New-Item artifacts -itemtype directory -Force | Out-Null
Copy-Item release/wininstaller/zecwallet.msi ./artifacts/Windows-installer-$target.msi
Copy-Item release/wininstaller/zecwallet-lite.msi ./artifacts/Windows-installer-$target.msi

2
src/scripts/signbinaries.sh
View File

@ -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 *zecwallet-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do
for i in $( ls *zecwallet-lite-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do
echo "Signing" $i
gpg --batch --output ../release/signatures/$i.sig --detach-sig $i
done

27
src/scripts/zec-qt-wallet.wxs
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="ZecWallet vRELEASE_VERSION" Language="1033" Version="RELEASE_VERSION" Manufacturer="zec-qt-wallet-org" UpgradeCode="fb9bf166-b55f-46b5-a990-9189bdf64533">
<Product Id="*" Name="ZecWallet Lite vRELEASE_VERSION" Language="1033" Version="RELEASE_VERSION" Manufacturer="zec-qt-wallet-org" UpgradeCode="fb9bf166-b55f-46b5-a990-9229bdf64533">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate EmbedCab="yes"/>
<Icon Id="zecqtwalleticon.exe" SourceFile="res/icon.ico"/>
<Property Id="ARPPRODUCTICON" Value="zecqtwalleticon.exe" />
<Icon Id="zecwalletliteicon.exe" SourceFile="res/icon.ico"/>
<Property Id="ARPPRODUCTICON" Value="zecwalletliteicon.exe" />
<Feature Id="ProductFeature" Title="zec-qt-wallet" Level="1">
<Feature Id="ProductFeature" Title="zecwallet-lite" Level="1">
<ComponentGroupRef Id="ProductComponents" />
<ComponentRef Id="ProgramMenuDir"/>
</Feature>
@ -37,13 +37,13 @@
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="zec-qt-wallet" />
<Directory Id="INSTALLFOLDER" Name="zecwallet-lite" />
</Directory>
<Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ApplicationProgramsFolder" Name="zec-qt-wallet">
<Component Id="ProgramMenuDir" Guid="0D560F5A-53E0-4E7E-ADDA-15A26995505E">
<Directory Id="ApplicationProgramsFolder" Name="zecwallet-lite">
<Component Id="ProgramMenuDir" Guid="0D560F5A-53E0-4E7E-AEEA-15A26995505E">
<RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\zec-qt-wallet\WixSetup"
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\zecwallet-lite\WixSetup"
Type="integer" Value="1" Name="installed" KeyPath="yes" />
</Component>
</Directory>
@ -55,24 +55,21 @@
<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Component Id="ProductComponent" Guid="0D210F5A-53E0-4E7E-CAAD-15A26995505E">
<File Source="zecwallet.exe" KeyPath="yes">
<File Source="zecwallet-lite.exe" KeyPath="yes">
<Shortcut Id="startMenuShotcut" Advertise="yes" Directory="ApplicationProgramsFolder"
Name="ZecWallet" WorkingDirectory="INSTALLFOLDER" Icon="zecqtwalleticon.exe" >
Name="ZecWallet" WorkingDirectory="INSTALLFOLDER" Icon="zecwalletliteicon.exe" >
</Shortcut>
</File>
<File Source="LICENSE" />
<File Source="zcashd.exe" />
<File Source="zcash-cli.exe" />
<File Source="README.md" />
<RegistryKey Root="HKCR" Key="zcash">
<RegistryValue Type="string" Name="URL Protocol" Value=""/>
<RegistryValue Type="string" Value="URL:zcash URI protocol"/>
<RegistryKey Key="DefaultIcon">
<RegistryValue Type="string" Value="zecwallet.exe" />
<RegistryValue Type="string" Value="zecwallet-lite.exe" />
</RegistryKey>
<RegistryKey Key="shell\open\command">
<RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]zecwallet.exe&quot; &quot;%1&quot;" />
<RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]zecwallet-lite.exe&quot; &quot;%1&quot;" />
</RegistryKey>
</RegistryKey>
</Component>

Write Preview
Loading…
Cancel
Save