moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

Externalize library and framework management

This commit is contained in:
Reinhard Pointner 2019-05-31 22:18:19 +07:00
parent d14af0ce47
commit 4906c2d930
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.xml
View File

@ -344,11 +344,8 @@
<property name="path.app.jre" location="${path.app}/Contents/PlugIns/openjdk.jre" />
<!-- import embedded runtime properties -->
<property file="${dir.lib}/jre.properties" />
<!-- MAS validation is a bit buggy and requires even libraries and frameworks to have a unique CFBundleIdentifier Collision -->
<replace file="${path.app.jre}/Contents/Info.plist" token="net.java.openjdk.${jre.version}.jdk" value="${package.identifier}.jdk" encoding="UTF-8" summary="true" />
<replace file="${path.app.jre}/Contents/Info.plist" token="net.java.openjdk" value="${package.identifier}.openjdk" encoding="UTF-8" summary="true" />
<!-- fix broken symlink -->
<copy file="${dir.staging}/openjdk.jre/Contents/Home/lib/jli/libjli.dylib" tofile="${path.app.jre}/Contents/MacOS/libjli.dylib" overwrite="yes" verbose="yes" failonerror="yes" />

2
installer/app/filebot.sh
View File

@ -15,7 +15,7 @@ done
# get canonical path
BIN=`dirname "$PRG"`
FILEBOT_HOME=`cd "$BIN/.." && pwd`
JAVA_HOME="$FILEBOT_HOME/PlugIns/jdk-@{jre.version}.jdk/Contents/Home"
JAVA_HOME="$FILEBOT_HOME/PlugIns/openjdk.jre/Contents/Home"
# select application data folder
APP_DATA="$HOME/.filebot"

2
installer/pkg/filebot.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
FILEBOT_HOME="/Applications/FileBot.app/Contents"
JAVA_HOME="$FILEBOT_HOME/PlugIns/jdk-@{jre.version}.jdk/Contents/Home"
JAVA_HOME="$FILEBOT_HOME/PlugIns/openjdk.jre/Contents/Home"
# select application data folder
APP_DATA="$HOME/.filebot"