moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-01-08 12:28:04 -05:00
Code Issues Releases Wiki Activity

Use embedded JRE for AMD64 DEB package

Browse Source
This commit is contained in:
Reinhard Pointner 2018-06-20 20:35:19 +07:00
parent 5e40beafe8
commit dd2d614981
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.xml
View File

@ -531,11 +531,16 @@
<target name="deb-arch">
<property name="dir.staging" location="${dir.dist}/deb/${arch}" />
<get-linux-jre dest="${dir.staging}/jre" />
<copy-replace todir="${dir.staging}">
<fileset dir="${dir.installer}/deb" />
</copy-replace>
<jdeb destfile="${dir.dist}/${application.name}_${application.version}_${deb.arch}.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true">
<tarfileset prefix="/usr/share/filebot/jre" dir="${dir.staging}/jre" includes="**/bin/**" filemode="755" />
<tarfileset prefix="/usr/share/filebot/jre" dir="${dir.staging}/jre" excludes="**/bin/**" />
<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" />
<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-${arch}" includes="fpcalc" filemode="755" />

2
installer/deb/filebot.sh
View File

@ -9,4 +9,4 @@ fi
# select application data folder
APP_DATA="$HOME/.filebot"
java @{java.application.options} -Dapplication.deployment=deb -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dnet.filebot.UserFiles.fileChooser=JavaFX -Djdk.gtk.version=2 -Dsun.java2d.xrender=true -Dapplication.help=show -DuseGVFS=true -Dnet.filebot.gio.GVFS="$XDG_RUNTIME_DIR/gvfs" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/tmp" -Djna.boot.library.path="$APP_ROOT/lib" -Djna.library.path="$APP_ROOT/lib" -Djava.library.path="$APP_ROOT/lib" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/lib/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/jar/*" @{main.class} "$@"
"$APP_ROOT/jre/bin/java" @{java.application.options} -Dapplication.deployment=deb -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dnet.filebot.UserFiles.fileChooser=JavaFX -Djdk.gtk.version=2 -Dsun.java2d.xrender=true -Dapplication.help=show -DuseGVFS=true -Dnet.filebot.gio.GVFS="$XDG_RUNTIME_DIR/gvfs" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/tmp" -Djna.boot.library.path="$APP_ROOT/lib" -Djna.library.path="$APP_ROOT/lib" -Djava.library.path="$APP_ROOT/lib" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/lib/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/jar/*" @{main.class} "$@"