From 46cdfafd5e51c0b8e0ff3d76c2619e69ede20cca Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sat, 23 Apr 2016 14:05:57 +0200 Subject: [PATCH] Add util script for collecting binaries --- .../io/bitsquare/common/util/Utilities.java | 1 - package/mac/collect_files.sh | 22 +++++++++++++++++++ package/mac/create_app.sh | 7 ++++-- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 package/mac/collect_files.sh diff --git a/common/src/main/java/io/bitsquare/common/util/Utilities.java b/common/src/main/java/io/bitsquare/common/util/Utilities.java index e6da9b8a2d..76ce508dfe 100644 --- a/common/src/main/java/io/bitsquare/common/util/Utilities.java +++ b/common/src/main/java/io/bitsquare/common/util/Utilities.java @@ -144,7 +144,6 @@ public class Utilities { log.info("os.name: " + System.getProperty("os.name")); log.info("os.version: " + System.getProperty("os.version")); log.info("os.arch: " + System.getProperty("os.arch")); - log.info("os.name: " + System.getProperty("os.name")); log.info("sun.arch.data.model: " + getJVMArchitecture()); log.info("JRE: " + System.getProperty("java.runtime.version", "-") + " (" + System.getProperty("java.vendor", "-") + ")"); log.info("JVM: " + System.getProperty("java.vm.version", "-") + " (" + System.getProperty("java.vm.name", "-") + ")"); diff --git a/package/mac/collect_files.sh b/package/mac/collect_files.sh new file mode 100644 index 0000000000..ab0369dca6 --- /dev/null +++ b/package/mac/collect_files.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +version="0.4.3" + +target_dir="/Users/mk/Documents/__bitsquare/_releases/$version" + +cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/bundles/Bitsquare-0.4.3.dmg" "$target_dir/Bitsquare-0.4.3.dmg " +cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/SeedNode-0.4.3.jar" "$target_dir/SeedNode-0.4.3.jar" + + +linux32="Bitsquare-32bit-$version.deb" +cp "/Users/mk/vm_shared_ubuntu14_32bit/$linux32" "$target_dir/$linux32 " + +linux64="Bitsquare-64bit-$version.deb" +cp "/Users/mk/vm_shared_ubuntu/$linux64" "$target_dir/$linux64" + +exe="Bitsquare.exe" +cp "/Users/mk/vm_shared_windows_32bit/bundles/$exe" "$target_dir/Bitsquare-32bit-$version.exe" +cp "/Users/mk/vm_shared_windows/bundles/$exe" "$target_dir/Bitsquare-64bit-$version.exe" +cp "/Users/mk/vm_shared_windows/bundles/$exe" "/Users/mk/vm_shared_win10/Bitsquare-64bit-$version.exe" + +open "$target_dir" \ No newline at end of file diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh index 4469526ab6..0265c41d2f 100644 --- a/package/mac/create_app.sh +++ b/package/mac/create_app.sh @@ -37,7 +37,10 @@ $JAVA_HOME/bin/javapackager \ rm "gui/deploy/Bitsquare.html" rm "gui/deploy/Bitsquare.jnlp" -mv "gui/deploy/bundles/Bitsquare.dmg" "gui/deploy/Bitsquare-$fullVersion.dmg" -rm gui/deploy/bundles +mv "gui/deploy/bundles/Bitsquare-$fullVersion.dmg" "gui/deploy/Bitsquare-$fullVersion.dmg" +rm "gui/deploy/bundles" + +mv "gui/deploy/SeedNode.jar" "gui/deploy/SeedNode-0.4.3.jar" + cd package/mac \ No newline at end of file