mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix snappy build

This commit is contained in:
Reinhard Pointner 2016-11-25 04:26:32 +08:00
parent 47afc73df7
commit 1dc3a065ff
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.xml
View File

@ -510,7 +510,9 @@
<target name="snap" depends="revision"> <target name="snap" depends="revision">
<copy tofile="${dir.dist}/snappy/filebot/FileBot.jar" file="${path.fatjar}" /> <copy tofile="${dir.dist}/snappy/filebot/FileBot.jar" file="${path.fatjar}" />
<copy todir="${dir.dist}/snappy/filebot/lib/amd64">
<!-- include native binaries that are not available via apt -->
<copy todir="${dir.dist}/snappy/filebot">
<fileset dir="${dir.lib}/native/linux-amd64" excludes="fpcalc, libmediainfo.so, libzen.so" /> <fileset dir="${dir.lib}/native/linux-amd64" excludes="fpcalc, libmediainfo.so, libzen.so" />
</copy> </copy>

2
installer/snappy/filebot/filebot.sh
View File

@ -6,7 +6,7 @@ export JAVA_HOME="$SNAP/usr/lib/jvm/java-8-openjdk-$SNAP_ARCH"
# export JAVA_TOOL_OPTIONS="-javaagent:$SNAP/usr/share/java/jayatanaag.jar" # export JAVA_TOOL_OPTIONS="-javaagent:$SNAP/usr/share/java/jayatanaag.jar"
export PATH="$JAVA_HOME/jre/bin:$PATH" export PATH="$JAVA_HOME/jre/bin:$PATH"
export LD_LIBRARY_PATH="$SNAP/filebot/lib/$SNAP_ARCH:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$SNAP:$LD_LIBRARY_PATH"
export APP_ROOT="$SNAP/filebot" export APP_ROOT="$SNAP/filebot"
export APP_DATA="$SNAP_USER_DATA/data" export APP_DATA="$SNAP_USER_DATA/data"

8
installer/snappy/snapcraft.yaml
View File

@ -10,19 +10,17 @@ architectures: [amd64]
apps: apps:
filebot: filebot:
command: desktop-launch $SNAP/filebot/filebot.sh command: desktop-launch $SNAP/filebot.sh
plugs: [unity7, opengl, x11, home, network, network-bind, pulseaudio, gsettings] plugs: [unity7, opengl, x11, home, network, network-bind, pulseaudio, gsettings]
parts: parts:
filebot: filebot:
plugin: dump plugin: dump
source: . source: filebot
organize:
filebot: filebot
after: [desktop-gtk2]
java: java:
plugin: nil plugin: nil
stage-packages: [openjdk-8-jre, openjfx, jayatana] stage-packages: [openjdk-8-jre, openjfx, jayatana]
after: [desktop-gtk2]
mediainfo: mediainfo:
plugin: nil plugin: nil
stage-packages: [libmediainfo0v5, libchromaprint-tools] stage-packages: [libmediainfo0v5, libchromaprint-tools]