Build self-contained APP bundle (non-MAS)

This commit is contained in:
Reinhard Pointner 2018-06-12 20:22:21 +07:00
parent 3f960d685e
commit 5313fc081d
3 changed files with 4 additions and 15 deletions

View File

@ -378,14 +378,6 @@
</target>
<target name="cask" description="Build Mac application bundle">
<tar destfile="${dir.dist}/${release}-darwin.tar.xz" compression="xz" longfile="posix" encoding="utf-8">
<tarfileset file="${path.fatjar}" fullpath="FileBot.jar" />
<tarfileset dir="${dir.installer}/cask" includes="*.sh" filemode="755" />
<tarfileset prefix="lib" dir="${dir.lib}/native/mac-x86_64" includes="fpcalc" filemode="755" />
<tarfileset prefix="lib" dir="${dir.lib}/native/mac-x86_64" includes="*.dylib" />
</tar>
</target>
<target name="appbundle-maspkg-core">

View File

@ -16,5 +16,8 @@ done
BIN=`dirname "$PRG"`
APP_ROOT=`cd "$BIN/.." && pwd`
JAVA_HOME="$APP_ROOT/PlugIns/jre-@{java.version}.jre/Contents/Home"
LIBRARY_PATH="$APP_ROOT/MacOS"
# launch filebot
"$APP_ROOT"/PlugIns/*.jre/Contents/Home/bin/java @{java.application.options} -Dapplication.deployment=app -Djava.awt.headless=true -Dapple.awt.UIElement=true -Djna.boot.library.path="$APP_ROOT/MacOS" -Djna.library.path="$APP_ROOT/MacOS" -Djava.library.path="$APP_ROOT/MacOS" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/MacOS/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/Java/*" net.filebot.Main "$@"
"$JAVA_HOME/bin/java" @{java.application.options} -Dapplication.deployment=app -Djava.awt.headless=true -Dapple.awt.UIElement=true -Djna.boot.library.path="$LIBRARY_PATH" -Djna.library.path="$LIBRARY_PATH" -Djava.library.path="$LIBRARY_PATH" -Dnet.filebot.AcoustID.fpcalc="$LIBRARY_PATH/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/Java/*" net.filebot.Main "$@"

View File

@ -1,6 +0,0 @@
#!/bin/sh
APP_EXE=`readlink /usr/local/bin/filebot`
APP_ROOT=`dirname "$APP_EXE"`
# start filebot
/usr/libexec/java_home --failfast --version "@{jvm.version}+" --exec java @{java.application.options} -Dapplication.deployment=cask -Djava.awt.headless=true -Dapple.awt.UIElement=true -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/*" @{main.class} "$@"