Linux build implementation

yermak · Jan 24, 2021 · 8f35e92 · 8f35e92
1 parent 1ec0731
commit 8f35e92
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 11 deletions.
diff --git a/build/linux/package.sh b/build/linux/package.sh
@@ -1,9 +1,31 @@
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/jmods:$JAVAFX_JMODS \
---add-modules java.base,java.sql,javafx.controls,javafx.fxml,javafx.media,javafx.base,javafx.swing,javafx.graphics --output target/fx-jre
+JAVA_HOME=$1
+JAVAFX_JMODS=$2
+APP_VERSION=$3
 
-$JAVA_HOME/bin/jpackage --app-version $(APP_VERSION)  --license-file LICENSE --icon AudioBookConverter.icns \
---type dmg \
---input target/package/audiobookconverter-$(APP_VERSION)-mac-installer/audiobookconverter-$(APP_VERSION)/app \
---main-jar lib/audiobookconverter-$(APP_VERSION).jar --runtime-image target/fx-jre --java-options '--enable-preview'
+rm -rf target/release
 mkdir target/release
-mv -f *.dmg target/release
+
+rm -rf target/fx-jre
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/jmods:$JAVAFX_JMODS \
+--add-modules java.base,java.sql,javafx.controls,javafx.fxml,javafx.media,javafx.base,javafx.swing,javafx.graphics \
+--strip-native-commands --strip-debug --no-man-pages --no-header-files --exclude-files=**.md \
+--output target/fx-jre
+
+rm -rf target/image
+$JAVA_HOME/bin/jpackage --app-version $APP_VERSION  -t app-image --icon AudioBookConverter.png --name AudioBookConverter --vendor Recoupler \
+--input target/package/audiobookconverter-$APP_VERSION-linux-installer/audiobookconverter-$APP_VERSION/app \
+--main-jar lib/audiobookconverter-$APP_VERSION.jar --runtime-image target/fx-jre \
+--dest target/image --java-options '--enable-preview'
+strip target/image/AudioBookConverter/bin/AudioBookConverter
+
+cd target/image
+tar -czf ../release/AudioBookConverter-static-binaries-$APP_VERSION.tar.gz AudioBookConverter
+cd ../..
+
+$JAVA_HOME/bin/jpackage --app-version $APP_VERSION  --license-file LICENSE --icon AudioBookConverter.png \
+-t deb --name AudioBookConverter --vendor Recoupler \
+--linux-menu-group AudioBookConverter --linux-shortcut \
+--input target/package/audiobookconverter-$APP_VERSION-linux-nodeps-installer/audiobookconverter-$APP_VERSION/app \
+--main-jar lib/audiobookconverter-$APP_VERSION.jar --runtime-image target/fx-jre --java-options '--enable-preview'
+
+mv audiobookconverter_$APP_VERSION-1_amd64.deb target/release/
diff --git a/src/main/java/uk/yermak/audiobookconverter/Utils.java b/src/main/java/uk/yermak/audiobookconverter/Utils.java
@@ -214,13 +214,13 @@ private static boolean isSupported() {
         return isWindows() || isLinux();
     }
 
-    public final static String FFMPEG = isSupported() ? new File("app/external/ffmpeg"+(isWindows()?".exe":"")).getAbsolutePath() : "ffmpeg";
+    public final static String FFMPEG = isSupported() ? new File(isWindows()?"":"../lib/"+"app/external/ffmpeg"+(isWindows()?".exe":"")).getAbsolutePath() : "ffmpeg";
 
-    public static final String MP4ART = isSupported() ? new File("app/external/mp4art"+(isWindows()?".exe":"")).getAbsolutePath() : "mp4art";
+    public static final String MP4ART = isSupported() ? new File(isWindows()?"":"../lib/"+"app/external/mp4art"+(isWindows()?".exe":"")).getAbsolutePath() : "mp4art";
 
-    public static final String MP4INFO = isSupported() ? new File("app/external/mp4info"+(isWindows()?".exe":"")).getAbsolutePath() : "mp4info";
+    public static final String MP4INFO = isSupported() ? new File(isWindows()?"":"../lib/"+"app/external/mp4info"+(isWindows()?".exe":"")).getAbsolutePath() : "mp4info";
 
-    public static final String FFPROBE = isSupported() ? new File("app/external/ffprobe"+(isWindows()?".exe":"")).getAbsolutePath() : "ffprobe";
+    public static final String FFPROBE = isSupported() ? new File(isWindows()?"":"../lib/"+"app/external/ffprobe"+(isWindows()?".exe":"")).getAbsolutePath() : "ffprobe";
 
 
 }