From 89aed23d670f41056142d77ed4a343ddc362b090 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 29 Apr 2016 11:22:58 +0200 Subject: [PATCH] v0.4.6 --- common/pom.xml | 2 +- .../main/java/io/bitsquare/app/Version.java | 2 +- core/pom.xml | 2 +- gui/pom.xml | 2 +- jsocks/pom.xml | 2 +- jtorctl/pom.xml | 2 +- jtorproxy/pom.xml | 2 +- network/pom.xml | 2 +- package/linux/create_32bit_app.sh | 2 +- package/linux/create_64bit_app.sh | 2 +- package/mac/create_app.sh | 2 +- package/mac/finalize.sh | 52 +++++++------------ package/mac/hashes.template | 5 -- package/windows/Bitsquare.iss | 2 +- package/windows/create_32bit_app.bat | 6 +-- package/windows/create_64bit_app.bat | 6 +-- pom.xml | 2 +- seednode/pom.xml | 2 +- 18 files changed, 38 insertions(+), 59 deletions(-) delete mode 100644 package/mac/hashes.template diff --git a/common/pom.xml b/common/pom.xml index 7720a3cdd04..09bca2d0f83 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.5 + 0.4.6 4.0.0 diff --git a/common/src/main/java/io/bitsquare/app/Version.java b/common/src/main/java/io/bitsquare/app/Version.java index 58aa3811fa9..2eeb8aa43a5 100644 --- a/common/src/main/java/io/bitsquare/app/Version.java +++ b/common/src/main/java/io/bitsquare/app/Version.java @@ -24,7 +24,7 @@ public class Version { private static final Logger log = LoggerFactory.getLogger(Version.class); // The application versions - public static final String VERSION = "0.4.5"; + public static final String VERSION = "0.4.6"; // The version nr. for the objects sent over the network. A change will break the serialization of old objects. // If objects are used for both network and database the network version is applied. diff --git a/core/pom.xml b/core/pom.xml index b1429928dba..ec0db52f844 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.4.5 + 0.4.6 core diff --git a/gui/pom.xml b/gui/pom.xml index cad2845d6c0..36588d14474 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.4.5 + 0.4.6 4.0.0 diff --git a/jsocks/pom.xml b/jsocks/pom.xml index f96bc7a0fa3..c9e233d81de 100644 --- a/jsocks/pom.xml +++ b/jsocks/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.5 + 0.4.6 4.0.0 diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml index 69ecdb9e406..1fbeec821f0 100644 --- a/jtorctl/pom.xml +++ b/jtorctl/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.5 + 0.4.6 4.0.0 diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml index 50c53e12c47..01181f00cb2 100644 --- a/jtorproxy/pom.xml +++ b/jtorproxy/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.5 + 0.4.6 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index a4f32799fcb..e300254188d 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.5 + 0.4.6 4.0.0 diff --git a/package/linux/create_32bit_app.sh b/package/linux/create_32bit_app.sh index 1b1f48d439e..a7b279e22dc 100644 --- a/package/linux/create_32bit_app.sh +++ b/package/linux/create_32bit_app.sh @@ -6,7 +6,7 @@ mkdir -p gui/deploy set -e # Edit versions -fullVersion=0.4.5 +fullVersion=0.4.6 jarFile="/home/bitsquare/Desktop/sf_vm_shared_ubuntu14_32bit/Bitsquare-$fullVersion.jar" # Note: fakeroot needs to be installed on linux diff --git a/package/linux/create_64bit_app.sh b/package/linux/create_64bit_app.sh index 7d251e1a47a..3ce337df347 100644 --- a/package/linux/create_64bit_app.sh +++ b/package/linux/create_64bit_app.sh @@ -6,7 +6,7 @@ mkdir -p gui/deploy set -e # Edit versions -fullVersion=0.4.5 +fullVersion=0.4.6 jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar" # Note: fakeroot needs to be installed on linux diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh index 33969eb1139..b75a40b79d3 100644 --- a/package/mac/create_app.sh +++ b/package/mac/create_app.sh @@ -5,7 +5,7 @@ mkdir -p gui/deploy set -e -fullVersion="0.4.5" +fullVersion="0.4.6" mvn clean package -DskipTests -Dmaven.javadoc.skip=true diff --git a/package/mac/finalize.sh b/package/mac/finalize.sh index 112a09ca52b..fa2109f77de 100644 --- a/package/mac/finalize.sh +++ b/package/mac/finalize.sh @@ -1,50 +1,34 @@ #!/bin/bash -version="0.4.5" +version="0.4.6" target_dir="/Users/mk/Documents/__bitsquare/_releases/$version" -cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/Bitsquare-$version.dmg" "$target_dir/Bitsquare-$version.dmg" -cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/SeedNode-$version.jar" "$target_dir/SeedNode-$version.jar" +mac="Bitsquare-$version.dmg" +cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/$mac" "$target_dir/" +cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/SeedNode-$version.jar" "$target_dir/" -linux32="Bitsquare-32bit-$version.deb" -cp "/Users/mk/vm_shared_ubuntu14_32bit/$linux32" "$target_dir/$linux32" +deb32="Bitsquare-32bit-$version.deb" +cp "/Users/mk/vm_shared_ubuntu14_32bit/$deb32" "$target_dir/" -linux64="Bitsquare-64bit-$version.deb" -cp "/Users/mk/vm_shared_ubuntu/$linux64" "$target_dir/$linux64" +deb64="Bitsquare-64bit-$version.deb" +cp "/Users/mk/vm_shared_ubuntu/$deb64" "$target_dir/" 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" +win32="Bitsquare-32bit-$version.exe" +cp "/Users/mk/vm_shared_windows_32bit/bundles/$exe" "$target_dir/$win32" +win64="Bitsquare-64bit-$version.exe" +cp "/Users/mk/vm_shared_windows/bundles/$exe" "$target_dir/$win64" +cp "/Users/mk/vm_shared_windows/bundles/$exe" "/Users/mk/vm_shared_win10/$win64" -cp "hashes.template" "$target_dir/hashes.template" cd "$target_dir" -MAC="Bitsquare-$version.dmg" -HASH_MAC="$(shasum -a 256 $MAC)" +shasum -a 256 "$mac" "$deb64" "$deb32" "$win64" "$win32" > sha256_hashes.txt -DEB_64="Bitsquare-64bit-$version.deb" -HASH_DEB_64="$(shasum -a 256 $DEB_64)" +gpg --local-user manfred@bitsquare.io --output signed_sha256_hashes.txt --clearsign sha256_hashes.txt -DEB_64="Bitsquare-64bit-$version.deb" -HASH_DEB_64="$(shasum -a 256 $DEB_64)" +gpg --verify signed_sha256_hashes.txt -DEB_32="Bitsquare-32bit-$version.deb" -HASH_DEB_32="$(shasum -a 256 $DEB_32)" +rm "$target_dir/sha256_hashes.txt" -WIN_64="Bitsquare-64bit-$version.exe" -HASH_WIN_64="$(shasum -a 256 $WIN_64)" - -WIN_32="Bitsquare-32bit-$version.exe" -HASH_WIN_32="$(shasum -a 256 $WIN_32)" - -sed -e "s|HASH_MAC|$HASH_MAC|" -e "s|HASH_DEB_64|$HASH_DEB_64|" -e "s|HASH_DEB_32|$HASH_DEB_32|" -e "s|HASH_WIN_64|$HASH_WIN_64|" -e "s|HASH_WIN_32|$HASH_WIN_32|" hashes.template > hashes.txt - -gpg --local-user manfred@bitsquare.io --output signed_sha256_hashes.txt --clearsign hashes.txt -gpg --verify signed_hashes.txt - -rm "$target_dir/hashes.template" -rm "$target_dir/hashes.txt" - -open "$target_dir" \ No newline at end of file +open "$target_dir" diff --git a/package/mac/hashes.template b/package/mac/hashes.template deleted file mode 100644 index 71d008a0649..00000000000 --- a/package/mac/hashes.template +++ /dev/null @@ -1,5 +0,0 @@ -HASH_MAC -HASH_DEB_64 -HASH_DEB_32 -HASH_WIN_64 -HASH_WIN_32 \ No newline at end of file diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss index 7404ba8961e..f61378d0d3a 100755 --- a/package/windows/Bitsquare.iss +++ b/package/windows/Bitsquare.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bitsquare}} AppName=Bitsquare -AppVersion=0.4.5 +AppVersion=0.4.6 AppVerName=Bitsquare AppPublisher=Bitsquare AppComments=Bitsquare diff --git a/package/windows/create_32bit_app.bat b/package/windows/create_32bit_app.bat index 8856e5031c3..8e02a77e345 100644 --- a/package/windows/create_32bit_app.bat +++ b/package/windows/create_32bit_app.bat @@ -1,13 +1,13 @@ cd ..\..\ mkdir gui\deploy -:: edit iss file -> AppVersion=0.4.5 +:: edit iss file -> AppVersion=0.4.6 :: Copy gui/deploy.Bitsquare.jar file from mac build to windows -:: edit -> -BappVersion=0.4.5 and -srcfiles +:: edit -> -BappVersion=0.4.6 and -srcfiles :: 32 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.5 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows_32bit" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows_32bit\Bitsquare-0.4.5.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true +call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.6 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows_32bit" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows_32bit\Bitsquare-0.4.6.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true cd package\windows \ No newline at end of file diff --git a/package/windows/create_64bit_app.bat b/package/windows/create_64bit_app.bat index bae1dfcf573..2995a21048b 100644 --- a/package/windows/create_64bit_app.bat +++ b/package/windows/create_64bit_app.bat @@ -1,13 +1,13 @@ cd ..\..\ mkdir gui\deploy -:: edit iss file -> AppVersion=0.4.5 +:: edit iss file -> AppVersion=0.4.6 :: Copy gui/deploy.Bitsquare.jar file from mac build to windows -:: edit -> -BappVersion=0.4.5 and -srcfiles +:: edit -> -BappVersion=0.4.6 and -srcfiles :: 64 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.5 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.4.5.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true +call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.6 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.4.6.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true cd package\windows \ No newline at end of file diff --git a/pom.xml b/pom.xml index 54ce878c55f..8271d473944 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.4.5 + 0.4.6 Bitsquare - The decentralized bitcoin exchange https://bitsquare.io diff --git a/seednode/pom.xml b/seednode/pom.xml index 55e510c8fbb..ec4a5cf65af 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.5 + 0.4.6 4.0.0