Skip to content

Commit

Permalink
Merge pull request #211 from yermak/feature/151_linux_distr
Browse files Browse the repository at this point in the history
feature/151_linux_distr
  • Loading branch information
yermak committed Jan 28, 2021
2 parents a9950dd + 43c2722 commit a0c7d1b
Show file tree
Hide file tree
Showing 30 changed files with 1,201 additions and 55 deletions.
16 changes: 0 additions & 16 deletions app/external/x64/README.md

This file was deleted.

31 changes: 31 additions & 0 deletions build/linux/package.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
JAVA_HOME=$1
JAVAFX_JMODS=$2
APP_VERSION=$3

rm -rf target/release
mkdir 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/
16 changes: 1 addition & 15 deletions build_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,7 @@ jobs:
export JAVAFX_JMODS=javafx-jmods-15.0.1
mvn clean package --no-transfer-progress
$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/bin/jpackage --app-version $(APP_VERSION) -t app-image --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'
$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-installer/audiobookconverter-$(APP_VERSION)/app \
--main-jar lib/audiobookconverter-$(APP_VERSION).jar --runtime-image target/fx-jre --java-options '--enable-preview'
mkdir target/release
mv audiobookconverter_$(APP_VERSION)-1_amd64.deb target/release/
call build/linux/package.sh $JAVA_HOME $JAVAFX_JMODS $(APP_VERSION)
condition: eq( variables['Agent.OS'], 'Linux' )
displayName: 'Build deb package'
Expand Down
File renamed without changes.
File renamed without changes.
Binary file added external/x64/linux/ffmpeg
Binary file not shown.
Binary file added external/x64/linux/ffprobe
Binary file not shown.
Binary file added external/x64/linux/mp4art
Binary file not shown.
Binary file added external/x64/linux/mp4info
Binary file not shown.
458 changes: 458 additions & 0 deletions external/x64/windows/COPYING.txt

Large diffs are not rendered by default.

0 comments on commit a0c7d1b

Please sign in to comment.