moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-23 00:08:51 -05:00
Code Issues Releases Wiki Activity

Revert to amd64 only DEB package due to JavaFX native dependencies

Browse Source 
➔ https://www.filebot.net/forums/viewtopic.php?f=11&t=6028&p=40242#p40241
This commit is contained in:
Reinhard Pointner 2018-11-28 23:15:37 +07:00
parent ca1b8c0440
commit a3c0323fd6
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.properties
View File

@ -68,7 +68,7 @@ mac.application.category: public.app-category.utilities
deb.application.categories: AudioVideo;Video;Utility;FileTools; deb.application.categories: AudioVideo;Video;Utility;FileTools;
deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*; deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*;
deb.application.class: net-filebot-Main deb.application.class: net-filebot-Main
deb.application.depends: openjdk-11-jre, openjfx, mediainfo, libchromaprint-tools, p7zip-full, p7zip-rar deb.application.depends: openjdk-11-jre, libmediainfo0v5, libchromaprint-tools, p7zip-full, p7zip-rar
deb.jna.depends: libjnidispatch.so deb.jna.depends: libjnidispatch.so
# Package Options # Package Options

16
build.xml
View File

@ -538,18 +538,17 @@
<target name="deb" depends="revision" description="Build Debian package"> <target name="deb" depends="revision" description="Build Debian package">
<property name="dir.staging" location="${dir.dist}/deb" /> <property name="dir.staging" location="${dir.dist}/deb" />
<get-linux-jre dest="${dir.staging}/jre" />
<copy-replace todir="${dir.staging}"> <copy-replace todir="${dir.staging}">
<fileset dir="${dir.installer}/deb" /> <fileset dir="${dir.installer}/deb" />
</copy-replace> </copy-replace>
<jdeb destfile="${dir.dist}/${application.name}_${application.version}.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true"> <jdeb destfile="${dir.dist}/${application.name}_${application.version}.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true">
<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" /> <tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
<tarfileset prefix="/usr/share/filebot/mod" dir="${dir.staging}/jre/ext/modules/lib" />
<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" /> <tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" />
<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/filebot/lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/filebot/lib/i686" dir="${dir.lib}/native/linux-i686" includes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/filebot/lib/aarch64" dir="${dir.lib}/native/linux-armv8" includes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/filebot/lib/armv7l" dir="${dir.lib}/native/linux-armv7l" includes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" /> <tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
<tarfileset prefix="/usr/share" dir="${dir.staging}/share" /> <tarfileset prefix="/usr/share" dir="${dir.staging}/share" />
@ -619,12 +618,9 @@
<tar destfile="${dir.dist}/${application.name}_${application.version}-aur.tar.xz" compression="${tar.compression}" longfile="posix" encoding="utf-8"> <tar destfile="${dir.dist}/${application.name}_${application.version}-aur.tar.xz" compression="${tar.compression}" longfile="posix" encoding="utf-8">
<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" /> <tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
<tarfileset prefix="/usr/share/filebot/mod" dir="${dir.staging}/jre/ext/modules/lib" />
<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" /> <tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" />
<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/filebot/lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/filebot/lib/i686" dir="${dir.lib}/native/linux-i686" includes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/filebot/lib/aarch64" dir="${dir.lib}/native/linux-armv8" includes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/filebot/lib/armv7l" dir="${dir.lib}/native/linux-armv7l" includes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" /> <tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
<tarfileset prefix="/usr/share" dir="${dir.staging}/share" /> <tarfileset prefix="/usr/share" dir="${dir.staging}/share" />

4
installer/deb/control/control
View File

@ -1,11 +1,11 @@
Package: @{package.name} Package: @{package.name}
Version: @{application.version} Version: @{application.version}
Architecture: all Architecture: amd64
Maintainer: @{package.developer} <@{package.maintainer}> Maintainer: @{package.developer} <@{package.maintainer}>
Description: @{package.synopsis} Description: @{package.synopsis}
@{package.description} @{package.description}
Homepage: @{package.homepage} Homepage: @{package.homepage}
Section: utils Section: utils
Priority: extra Priority: extra
Recommends: @{deb.application.depends} Depends: @{deb.application.depends}
Enhances: nautilus-actions Enhances: nautilus-actions

7
installer/deb/filebot.sh
View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
FILEBOT_HOME="/usr/share/filebot" FILEBOT_HOME="/usr/share/filebot"
JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
if [ -z "$HOME" ]; then if [ -z "$HOME" ]; then
echo '$HOME must be set' echo '$HOME must be set'
@ -8,7 +9,7 @@ fi
# select application data folder # select application data folder
APP_DATA="$HOME/.filebot" APP_DATA="$HOME/.filebot"
LIBRARY_PATH="$FILEBOT_HOME/lib/$(uname -m):/usr/lib/$(uname -m)-linux-gnu/jni" LIBRARY_PATH="$FILEBOT_HOME/lib"
MODULE_PATH="/usr/share/openjfx/lib" MODULE_PATH="$FILEBOT_HOME/mod"
java -Dapplication.deployment=deb --module-path "$MODULE_PATH" --add-modules ALL-MODULE-PATH -Dnet.filebot.Archive.extractor=SevenZipExecutable @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@" $JAVA_HOME/bin/java -Dapplication.deployment=deb --module-path "$MODULE_PATH" --add-modules ALL-MODULE-PATH -Dnet.filebot.Archive.extractor=SevenZipExecutable @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"