From a37df8e9c1d3dbe0b981d80be2af89d63e671d79 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 1 May 2018 19:07:34 +0200 Subject: [PATCH 1/7] Increase version number --- package/linux/32bitBuild.sh | 2 +- package/linux/64bitBuild.sh | 2 +- package/linux/Dockerfile | 2 +- package/osx/create_app.sh | 2 +- package/osx/finalize.sh | 2 +- package/windows/32bitBuild.bat | 2 +- package/windows/64bitBuild.bat | 2 +- package/windows/Bisq.iss | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh index 8cede5c50e1..9d65d75b831 100644 --- a/package/linux/32bitBuild.sh +++ b/package/linux/32bitBuild.sh @@ -6,7 +6,7 @@ mkdir -p deploy set -e # Edit version -version=0.6.7 +version=0.7.0 dir="/media/sf_vm_shared_ubuntu14_32bit" diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh index 7745625c204..9266671b775 100644 --- a/package/linux/64bitBuild.sh +++ b/package/linux/64bitBuild.sh @@ -6,7 +6,7 @@ mkdir -p deploy set -e # Edit version -version=0.6.7 +version=0.7.0 dir="/media/sf_vm_shared_ubuntu" diff --git a/package/linux/Dockerfile b/package/linux/Dockerfile index 24fb1f65a91..be101aeed8c 100644 --- a/package/linux/Dockerfile +++ b/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 0.6.7 +ENV version 0.7.0 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* && apt-get install -y vim fakeroot diff --git a/package/osx/create_app.sh b/package/osx/create_app.sh index 82c3b2b1b31..eab2e71206d 100755 --- a/package/osx/create_app.sh +++ b/package/osx/create_app.sh @@ -5,7 +5,7 @@ mkdir -p deploy set -e -version="0.6.7" +version="0.7.0" ./gradlew build diff --git a/package/osx/finalize.sh b/package/osx/finalize.sh index 0490607d240..e7f5ec000c2 100644 --- a/package/osx/finalize.sh +++ b/package/osx/finalize.sh @@ -1,6 +1,6 @@ #!/bin/bash -version="0.6.7" +version="0.7.0" target_dir="/Users/dev/Documents/__bisq/_releases/$version" src_dir="/Users/dev/idea/exchange" diff --git a/package/windows/32bitBuild.bat b/package/windows/32bitBuild.bat index 083e12bd27b..82c5557a01f 100644 --- a/package/windows/32bitBuild.bat +++ b/package/windows/32bitBuild.bat @@ -5,7 +5,7 @@ :: 32 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -SET version=0.6.7 +SET version=0.7.0 :: Private setup SET outdir=\\VBOXSVR\vm_shared_windows_32bit diff --git a/package/windows/64bitBuild.bat b/package/windows/64bitBuild.bat index 2ae1adf2701..e925eafb22e 100644 --- a/package/windows/64bitBuild.bat +++ b/package/windows/64bitBuild.bat @@ -5,7 +5,7 @@ :: 64 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -SET version=0.6.7 +SET version=0.7.0 :: Private setup SET outdir=\\VBOXSVR\vm_shared_windows diff --git a/package/windows/Bisq.iss b/package/windows/Bisq.iss index c518b2dcc51..9f09e408dff 100755 --- a/package/windows/Bisq.iss +++ b/package/windows/Bisq.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bisq}} AppName=Bisq -AppVersion=0.6.7 +AppVersion=0.7.0 AppVerName=Bisq AppPublisher=Bisq AppComments=Bisq From 7af493b9d8cec0d19bbbfdf3bb532895d5715a13 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 1 May 2018 19:09:17 +0200 Subject: [PATCH 2/7] Use bundle identifier owned by @ripcurlx --- package/osx/Info.plist | 2 +- package/osx/create_app.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/osx/Info.plist b/package/osx/Info.plist index 0be828bf28f..9ccc1e05052 100644 --- a/package/osx/Info.plist +++ b/package/osx/Info.plist @@ -15,7 +15,7 @@ CFBundleName Bisq CFBundleIdentifier - io.bisq.Bisq + network.bisq.CAT CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/package/osx/create_app.sh b/package/osx/create_app.sh index eab2e71206d..625427c3bdf 100755 --- a/package/osx/create_app.sh +++ b/package/osx/create_app.sh @@ -33,8 +33,8 @@ echo "Using JAVA_HOME: $JAVA_HOME" $JAVA_HOME/bin/javapackager \ -deploy \ -BappVersion=$version \ - -Bmac.CFBundleIdentifier=bisq \ - -Bmac.CFBundleName=Bisq \ + -Bmac.CFBundleIdentifier=network.bisq \ + -Bmac.CFBundleName=CAT \ -Bicon=package/osx/Bisq.icns \ -Bruntime="$JAVA_HOME/jre" \ -native dmg \ From 0f26e1890e72a1c5f972f69fe679fada3485a704 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 1 May 2018 19:14:39 +0200 Subject: [PATCH 3/7] Add workaround to be able to test creation of macOS bundle --- package/osx/Info.plist | 2 +- package/osx/create_app.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/osx/Info.plist b/package/osx/Info.plist index 9ccc1e05052..3a4ea776238 100644 --- a/package/osx/Info.plist +++ b/package/osx/Info.plist @@ -40,7 +40,7 @@ JVMAppClasspath JVMMainJarName - shaded.jar + Bisq-0.7.0.jar JVMPreferencesID bisq JVMOptions diff --git a/package/osx/create_app.sh b/package/osx/create_app.sh index 625427c3bdf..de00e39adf3 100755 --- a/package/osx/create_app.sh +++ b/package/osx/create_app.sh @@ -16,6 +16,9 @@ win64=build/vm/vm_shared_windows mkdir -p $linux32 $linux64 $win32 $win64 +# temp copy +cp build/libs/bisq-desktop--SNAPSHOT.jar "build/libs/bisq-desktop.jar" + cp build/libs/bisq-desktop.jar "deploy/Bisq-$version.jar" # copy app jar to VM shared folders From 41f6ce3bef47bb34b82c3ea0a5f30b04ce8c59d4 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 1 May 2018 19:14:50 +0200 Subject: [PATCH 4/7] Update copyright --- package/osx/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/osx/Info.plist b/package/osx/Info.plist index 3a4ea776238..da5a411f14d 100644 --- a/package/osx/Info.plist +++ b/package/osx/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion 1 NSHumanReadableCopyright - Copyright (C) 2015 + Copyright (C) 2018 NSHighResolutionCapable true JVMRuntime From b4245fd9aeace0c85674a49a3c341a041c2fc7e7 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 2 May 2018 18:24:43 +0200 Subject: [PATCH 5/7] Adapt script for new release --- package/osx/finalize.sh | 48 ++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 20 deletions(-) mode change 100644 => 100755 package/osx/finalize.sh diff --git a/package/osx/finalize.sh b/package/osx/finalize.sh old mode 100644 new mode 100755 index e7f5ec000c2..18b5f8a2f34 --- a/package/osx/finalize.sh +++ b/package/osx/finalize.sh @@ -1,9 +1,17 @@ #!/bin/bash +cd ../../ + version="0.7.0" -target_dir="/Users/dev/Documents/__bisq/_releases/$version" -src_dir="/Users/dev/idea/exchange" +target_dir="releases/$version" + +linux32=build/vm/vm_shared_ubuntu14_32bit +linux64=build/vm/vm_shared_ubuntu +win32=build/vm/vm_shared_windows_32bit +win64=build/vm/vm_shared_windows +macOS=build/vm/vm_shared_macosx +gpg_user="christoph.atteneder@gmail.com" rm -r $target_dir @@ -21,14 +29,14 @@ cp "$target_dir/../29CDFD3B.asc" "$target_dir/" # signing key cp "$target_dir/../signingkey.asc" "$target_dir/" -mac="Bisq-$version.dmg" -cp "$src_dir/deploy/$mac" "$target_dir/" +dmg="Bisq-$version.dmg" +cp "$macOS/$dmg" "$target_dir/" deb32="Bisq-32bit-$version.deb" -cp "/Users/dev/vm_shared_ubuntu14_32bit/$deb32" "$target_dir/" +cp "$linux32/$deb32" "$target_dir/" deb64="Bisq-64bit-$version.deb" -cp "/Users/dev/vm_shared_ubuntu/$deb64" "$target_dir/" +cp "$linux64/$deb64" "$target_dir/" #rpm32="Bisq-32bit-$version.rpm" #cp "/Users/dev/vm_shared_ubuntu14_32bit/$rpm32" "$target_dir/" @@ -38,27 +46,27 @@ cp "/Users/dev/vm_shared_ubuntu/$deb64" "$target_dir/" exe="Bisq-$version.exe" -win32="Bisq-32bit-$version.exe" -cp "/Users/dev/vm_shared_windows_32bit/bundles/$exe" "$target_dir/$win32" -win64="Bisq-64bit-$version.exe" -cp "/Users/dev/vm_shared_windows/bundles/$exe" "$target_dir/$win64" +exe32="Bisq-32bit-$version.exe" +cp "$win32/bundles/$exe" "$target_dir/$exe32" +exe64="Bisq-64bit-$version.exe" +cp "$win64/bundles/$exe" "$target_dir/$exe64" #cp "/Users/dev/vm_shared_windows/bundles/$exe" "/Users/dev/vm_shared_win10/$win64" cd "$target_dir" -gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $mac.asc --detach-sig --armor $mac -gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $deb64.asc --detach-sig --armor $deb64 -gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $deb32.asc --detach-sig --armor $deb32 -gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $win64.asc --detach-sig --armor $win64 -gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $win32.asc --detach-sig --armor $win32 +gpg --digest-algo SHA256 --local-user $gpg_user --output $dmg.asc --detach-sig --armor $dmg +gpg --digest-algo SHA256 --local-user $gpg_user --output $deb64.asc --detach-sig --armor $deb64 +gpg --digest-algo SHA256 --local-user $gpg_user --output $deb32.asc --detach-sig --armor $deb32 +gpg --digest-algo SHA256 --local-user $gpg_user --output $exe64.asc --detach-sig --armor $exe64 +gpg --digest-algo SHA256 --local-user $gpg_user --output $exe32.asc --detach-sig --armor $exe32 -gpg --digest-algo SHA256 --verify $mac{.asc*,} +gpg --digest-algo SHA256 --verify $dmg{.asc*,} gpg --digest-algo SHA256 --verify $deb64{.asc*,} gpg --digest-algo SHA256 --verify $deb32{.asc*,} -gpg --digest-algo SHA256 --verify $win64{.asc*,} -gpg --digest-algo SHA256 --verify $win32{.asc*,} +gpg --digest-algo SHA256 --verify $exe64{.asc*,} +gpg --digest-algo SHA256 --verify $exe32{.asc*,} -cp -r $target_dir /Users/dev/vm_shared_windows_32bit/ +#cp -r $target_dir /Users/dev/vm_shared_windows_32bit/ -open "$target_dir" +open "." From fdc8d8448d286c2e79a956463cbd335765d388e2 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 2 May 2018 18:39:11 +0200 Subject: [PATCH 6/7] Adapt linux path of VM --- package/linux/32bitBuild.sh | 3 ++- package/linux/64bitBuild.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh index 9d65d75b831..d41ba743696 100644 --- a/package/linux/32bitBuild.sh +++ b/package/linux/32bitBuild.sh @@ -9,6 +9,7 @@ set -e version=0.7.0 dir="/media/sf_vm_shared_ubuntu14_32bit" +linux_user="bisq" # Note: fakeroot needs to be installed on linux $JAVA_HOME/bin/javapackager \ @@ -44,7 +45,7 @@ $JAVA_HOME/bin/javapackager \ # sudo alien -r -c -k deploy/bundles/bisq-$version.deb -cp "deploy/bundles/bisq-$version.deb" "/home/bitsquare/Desktop/Bisq-32bit-$version.deb" +cp "deploy/bundles/bisq-$version.deb" "/home/$bisq/Desktop/Bisq-32bit-$version.deb" mv "deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.deb" # mv "bisq-$version-1.i386.rpm" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.rpm" diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh index 9266671b775..79d57188c1f 100644 --- a/package/linux/64bitBuild.sh +++ b/package/linux/64bitBuild.sh @@ -9,6 +9,7 @@ set -e version=0.7.0 dir="/media/sf_vm_shared_ubuntu" +linux_user="bisq" # Note: fakeroot needs to be installed on linux $JAVA_HOME/bin/javapackager \ @@ -44,7 +45,7 @@ $JAVA_HOME/bin/javapackager \ # uncomment because the build VM does not support alien #sudo alien -r -c -k deploy/bundles/bisq-$version.deb -cp "deploy/bundles/bisq-$version.deb" "/home/mk/Desktop/Bisq-64bit-$version.deb" +cp "deploy/bundles/bisq-$version.deb" "/home/$linux_user/Desktop/Bisq-64bit-$version.deb" mv "deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.deb" #mv "bisq-$version-1.x86_64.rpm" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.rpm" rm -r deploy/ From 4a7801023ddd68f802fe784e2ff4d24aaf70f463 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sun, 6 May 2018 15:37:06 +0200 Subject: [PATCH 7/7] Re-introduce fat executable jar for release packaging Prior to this fix, running `./package/osx/create_app.sh` produced a "Main application jar is missing." error. Now the script works as expected. --- .gitignore | 1 + build.gradle | 3 ++- package/osx/create_app.sh | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 7b14b1911ae..957b0dfbcbf 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ build desktop.ini */target/* *.class +deploy diff --git a/build.gradle b/build.gradle index 318535661f4..f90ac6363bf 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2' + classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4' classpath files('gradle/witness/gradle-witness.jar') } } @@ -12,6 +12,7 @@ apply plugin: 'java' apply plugin: 'application' apply plugin: 'maven' apply plugin: 'witness' +apply plugin: 'com.github.johnrengelman.shadow' group = 'network.bisq' version = '-SNAPSHOT' diff --git a/package/osx/create_app.sh b/package/osx/create_app.sh index de00e39adf3..e75f23e430e 100755 --- a/package/osx/create_app.sh +++ b/package/osx/create_app.sh @@ -1,13 +1,16 @@ #!/bin/bash -cd ../../ +cd $(dirname $0)/../../ + mkdir -p deploy set -e version="0.7.0" -./gradlew build +./gradlew shadowJar + +EXE_JAR=build/libs/bisq-desktop--SNAPSHOT-all.jar linux32=build/vm/vm_shared_ubuntu14_32bit linux64=build/vm/vm_shared_ubuntu @@ -16,17 +19,14 @@ win64=build/vm/vm_shared_windows mkdir -p $linux32 $linux64 $win32 $win64 -# temp copy -cp build/libs/bisq-desktop--SNAPSHOT.jar "build/libs/bisq-desktop.jar" - -cp build/libs/bisq-desktop.jar "deploy/Bisq-$version.jar" +cp $EXE_JAR "deploy/Bisq-$version.jar" # copy app jar to VM shared folders -cp build/libs/bisq-desktop.jar "$linux32/Bisq-$version.jar" -cp build/libs/bisq-desktop.jar "$linux64/Bisq-$version.jar" +cp $EXE_JAR "$linux32/Bisq-$version.jar" +cp $EXE_JAR "$linux64/Bisq-$version.jar" # At windows we don't add the version nr as it would keep multiple versions of jar files in app dir -cp build/libs/bisq-desktop.jar "$win32/Bisq.jar" -cp build/libs/bisq-desktop.jar "$win64/Bisq.jar" +cp $EXE_JAR "$win32/Bisq.jar" +cp $EXE_JAR "$win64/Bisq.jar" if [ -z "$JAVA_HOME" ]; then JAVA_HOME=$(/usr/libexec/java_home)