diff --git a/.gitignore b/.gitignore index 94a54c7..e4d3cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ Cargo.lock **/*.rs.bk build-cli* + +**/.DS_Store diff --git a/cli/src/version.rs b/cli/src/version.rs index 5a6a922..99595d0 100644 --- a/cli/src/version.rs +++ b/cli/src/version.rs @@ -1 +1 @@ -pub fn version() -> &'static str { &"0.3" } \ No newline at end of file +pub fn version() -> &'static str { &"0.4" } diff --git a/ui/mkrelease.sh b/ui/mkrelease.sh index aca4bed..1d5b073 100755 --- a/ui/mkrelease.sh +++ b/ui/mkrelease.sh @@ -79,7 +79,7 @@ echo "pub fn version() -> &'static str { &\"$APP_VERSION\" }" > src/version.rs cargo build --release # For Windows and Linux, build via docker -docker run --rm -v $(pwd)/..:/opt/zecpaperwallet rust/zecpaperwallet:v0.2 bash -c "cd /opt/zecpaperwallet/cli && cargo build --release --target x86_64-unknown-linux-musl && cargo build --release --target x86_64-pc-windows-gnu && cargo build --release --target aarch64-unknown-linux-gnu" +docker run --rm -v $(pwd)/..:/opt/zecpaperwallet rust/zecpaperwallet:v0.3 bash -c "cd /opt/zecpaperwallet/cli && cargo build --release --target x86_64-unknown-linux-musl && cargo build --release --target x86_64-pc-windows-gnu && cargo build --release --target aarch64-unknown-linux-gnu && cargo build --release --target armv7-unknown-linux-gnueabihf" # Come back and package everything cd ../ui @@ -133,3 +133,16 @@ cd .. zip -r aarch64-zecpaperwallet-v$APP_VERSION.zip aarch64-zecpaperwallet-v$APP_VERSION cd .. + +# ARMv7 +rm -rf artifacts/armv7-zecpaperwallet-v$APP_VERSION +mkdir -p artifacts/armv7-zecpaperwallet-v$APP_VERSION +cp ../cli/target/armv7-unknown-linux-gnueabihf/release/zecpaperwallet artifacts/armv7-zecpaperwallet-v$APP_VERSION/ +gpg --batch --output artifacts/armv7-zecpaperwallet-v$APP_VERSION/zecpaperwallet.sig --detach-sig artifacts/armv7-zecpaperwallet-v$APP_VERSION/zecpaperwallet +cd artifacts +cd armv7-zecpaperwallet-v$APP_VERSION +gsha256sum zecpaperwallet > sha256sum.txt +cd .. +zip -r armv7-zecpaperwallet-v$APP_VERSION.zip armv7-zecpaperwallet-v$APP_VERSION +cd .. + diff --git a/ui/src/version.h b/ui/src/version.h index d1abab5..cda90b4 100644 --- a/ui/src/version.h +++ b/ui/src/version.h @@ -1,2 +1,2 @@ -#define APP_VERSION "0.1" -#define APP_BUILD_DATE "20 Jun 2019" \ No newline at end of file +#define APP_VERSION "0.4" +#define APP_BUILD_DATE "2019-06-26" diff --git a/ui/zecpaperwalletui_resource.rc b/ui/zecpaperwalletui_resource.rc new file mode 100644 index 0000000..5785ce3 --- /dev/null +++ b/ui/zecpaperwalletui_resource.rc @@ -0,0 +1,37 @@ +#include + +IDI_ICON1 ICON DISCARDABLE "/opt/zecpaperwallet/ui/res/icon.ico" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,0,0,0 + PRODUCTVERSION 0,0,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "\0" + VALUE "FileVersion", "0.0.0.0\0" + VALUE "LegalCopyright", "\0" + VALUE "OriginalFilename", "zecpaperwalletui.exe\0" + VALUE "ProductName", "zecpaperwalletui\0" + VALUE "ProductVersion", "0.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1200 + END + END +/* End of Version info */ +