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.
This commit is contained in:
Chris Beams 2018-05-06 15:37:06 +02:00
parent dbd3d914f9
commit 4a7801023d
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
3 changed files with 13 additions and 11 deletions

1
.gitignore vendored
View file

@ -26,3 +26,4 @@ build
desktop.ini
*/target/*
*.class
deploy

View file

@ -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'

View file

@ -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)