From 03e077c09eb005b822b8e6e2658aa0f933ec8800 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 4 Dec 2018 15:12:54 +0100 Subject: [PATCH 1/3] Ignore release folder in desktop module --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1384f8b49cc..0b3cd7ebdcf 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,4 @@ desktop.ini */target/* *.class deploy -releases/* +*/releases/* From 74213ed9c3e5778aa026f8c0aa8d463748e6e340 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 4 Dec 2018 15:13:01 +0100 Subject: [PATCH 2/3] Implement workaround for Linux build --- desktop/package/linux/64bitBuild.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/desktop/package/linux/64bitBuild.sh b/desktop/package/linux/64bitBuild.sh index 5dfb61d0f00..8bd24ee4fbd 100644 --- a/desktop/package/linux/64bitBuild.sh +++ b/desktop/package/linux/64bitBuild.sh @@ -8,7 +8,13 @@ set -e # Edit version version=0.9.0 -dir="/media/sf_vm_shared_ubuntu" +sharedDir="/media/sf_vm_shared_ubuntu" + +dir="/home/$USER/Desktop/build" +mkdir -p $dir + +cp "$sharedDir/Bisq-$version.jar" "$dir/Bisq-$version.jar" +chmod o+rx "$dir/Bisq-$version.jar" # Note: fakeroot needs to be installed on Linux @@ -42,5 +48,6 @@ $JAVA_HOME/bin/javapackager \ cp "deploy/bisq-$version.deb" "/home/$USER/Desktop/Bisq-64bit-$version.deb" mv "deploy/bisq-$version.deb" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.deb" rm -r deploy/ +rm -r $dir cd package/linux From d96ee9ce011d67e2d9a2f12b105f53752d6d4b9a Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 4 Dec 2018 15:13:33 +0100 Subject: [PATCH 3/3] Fix wrong path in signing process --- desktop/package/macosx/finalize.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index 0e279e7ba73..b580975e7f6 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -38,7 +38,7 @@ cp "$linux64/$deb64" "$target_dir/" exe="Bisq-$version.exe" exe64="Bisq-64bit-$version.exe" -cp "$win64/bundles/$exe" "$target_dir/$exe64" +cp "$win64/$exe" "$target_dir/$exe64" cd "$target_dir"