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

Unify deb/ipk builds and switch to jdeb

This commit is contained in:
Reinhard Pointner 2016-11-04 06:46:00 +08:00
parent 8dabd5bd9a
commit 3c96a9f294
15 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
build.xml
View File

@ -525,49 +525,55 @@
<target name="deb" description="Build Debian Linux packages" depends="revision"> <target name="deb" description="Build Debian Linux packages" depends="revision">
<!-- arch i686 not allowed by deb specification, must be i386 for 32-bit x86 systems -->
<antcall target="deb-arch"> <antcall target="deb-arch">
<param name="arch" value="i686" /> <param name="arch" value="i686" />
<!-- arch i686 not allowed by deb specification, must be i386 for 32-bit x86 systems -->
<param name="deb.arch" value="i386" /> <param name="deb.arch" value="i386" />
<param name="deb.pkg" value="deb" />
<param name="deb.prefix" value="/usr" />
</antcall> </antcall>
<antcall target="deb-arch"> <antcall target="deb-arch">
<param name="arch" value="amd64" /> <param name="arch" value="amd64" />
<param name="deb.arch" value="amd64" /> <param name="deb.arch" value="amd64" />
<param name="deb.pkg" value="deb" />
<param name="deb.prefix" value="/usr" />
</antcall>
</target>
<target name="ipkg" description="Build embedded Linux packages" depends="revision">
<antcall target="deb-arch">
<param name="arch" value="noarch" />
<param name="deb.arch" value="noarch" />
<param name="deb.pkg" value="ipk" />
<param name="deb.prefix" value="/opt" />
</antcall> </antcall>
</target> </target>
<target name="deb-arch"> <target name="deb-arch">
<!-- stage created .deb files in a temporary folder --> <property name="dir.staging" location="${dir.dist}/${deb.pkg}/${arch}" />
<property name="deb.staging" location="${dir.dist}/deb" />
<mkdir dir="${deb.staging}" />
<deb debfilenameproperty="staging.file.deb" todir="${deb.staging}" package="filebot" version="${version}" architecture="${deb.arch}" section="misc" homepage="http://www.filebot.net/" priority="optional" postinst="${dir.installer}/deb/postinst.sh" prerm="${dir.installer}/deb/prerm.sh">
<maintainer name="Reinhard Pointner" email="maintainer@filebot.net" />
<description synopsis="The ultimate TV and Movie Renamer">FileBot is the ultimate tool for renaming your movies, tv shows or anime and even downloading subtitles. It's smart, streamlined for simplicity and just works. Putting the super-efficient UI aside, it's also got a full-featured command-line interface and scripting engine for all sorts of automation. Anything is possible.</description>
<tarfileset fullpath="usr/share/filebot/FileBot.jar" file="${path.fatjar}" />
<tarfileset prefix="usr/share/filebot" dir="${dir.lib}/native/linux-${arch}" includes="*.so" />
<tarfileset prefix="usr/share/filebot" file="${dir.lib}/native/linux-${arch}/fpcalc" filemode="755" />
<tarfileset prefix="usr/share/filebot" file="${dir.installer}/icons/icon.svg" />
<tarfileset prefix="usr/share/filebot/bin" file="${dir.installer}/deb/filebot.sh" filemode="755" />
<tarfileset prefix="usr/share/applications" file="${dir.installer}/deb/FileBot.desktop" />
</deb>
<move tofile="${dir.dist}/filebot_${version}_${deb.arch}.deb" file="${staging.file.deb}" overwrite="no" failonerror="yes" />
<delete dir="${deb.staging}" />
</target>
<copy todir="${dir.staging}" overwrite="yes" encoding="UTF-8" verbose="true">
<fileset dir="${dir.installer}/deb/${deb.pkg}" />
<fileset dir="${dir.installer}/deb" includes="control/**" />
<filterset begintoken="@{" endtoken="}">
<propertyset>
<propertyref builtin="all" />
</propertyset>
</filterset>
</copy>
<copy todir="${dir.staging}" verbose="true" failonerror="false">
<fileset dir="${dir.lib}/native/linux-${arch}" />
<fileset file="${dir.installer}/icons/icon.svg" />
</copy>
<copy file="${path.fatjar}" tofile="${dir.staging}/FileBot.jar" verbose="true" />
<target name="ipkg" description="Build embedded Linux packages" depends="revision"> <jdeb destfile="${dir.dist}/filebot_${version}_${deb.arch}.${deb.pkg}" control="${dir.staging}/control" compression="gz" changesIn="${dir.staging}/changes.txt" changesOut="${dir.dist}/filebot_${version}_${deb.arch}.${deb.pkg}.changes" verbose="true">
<!-- stage created .deb files in a temporary folder --> <tarfileset prefix="${deb.prefix}/share/filebot" dir="${dir.staging}" includes="*.sh, fpcalc" filemode="755" />
<property name="ipkg.staging" location="${dir.dist}/deb-ipkg" /> <tarfileset prefix="${deb.prefix}/share/filebot" dir="${dir.staging}" includes="*.jar, *.so, *.svg" />
<mkdir dir="${ipkg.staging}" /> <tarfileset prefix="${deb.prefix}/share/applications" dir="${dir.staging}" includes="*.desktop" />
<deb debfilenameproperty="staging.file.deb" todir="${ipkg.staging}" package="filebot" version="${version}" architecture="noarch" section="misc" homepage="http://www.filebot.net/" priority="optional" postinst="${dir.installer}/ipkg/postinst.sh" prerm="${dir.installer}/ipkg/prerm.sh"> </jdeb>
<maintainer name="Reinhard Pointner" email="maintainer@filebot.net" />
<description synopsis="The ultimate TV and Movie Renamer">FileBot is the ultimate tool for renaming your movies, tv shows or anime and even downloading subtitles. It's smart, streamlined for simplicity and just works. Putting the super-efficient UI aside, it's also got a full-featured command-line interface and scripting engine for all sorts of automation. Anything is possible.</description>
<tarfileset fullpath="opt/share/filebot/FileBot.jar" file="${path.fatjar}" />
<tarfileset prefix="opt/share/filebot/bin" file="${dir.installer}/ipkg/filebot.sh" filemode="755" />
</deb>
<move tofile="${dir.dist}/filebot_${version}_noarch.ipk" file="${staging.file.deb}" overwrite="no" failonerror="yes" />
<delete dir="${ipkg.staging}" />
</target> </target>
@ -737,7 +743,7 @@
</path> </path>
<taskdef uri="antlib:org.apache.ant.compress" resource="org/apache/ant/compress/antlib.xml" classpathref="lib.classpath" /> <taskdef uri="antlib:org.apache.ant.compress" resource="org/apache/ant/compress/antlib.xml" classpathref="lib.classpath" />
<taskdef resource="net/filebot/ant/spk/antlib.xml" classpathref="lib.classpath" /> <taskdef resource="net/filebot/ant/spk/antlib.xml" classpathref="lib.classpath" />
<taskdef resource="com/googlecode/ant_deb_task/antlib.xml" classpathref="lib.classpath" /> <taskdef resource="org/vafer/jdeb/ant/antlib.xml" classpathref="lib.classpath" />
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpathref="lib.classpath" /> <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpathref="lib.classpath" />
</target> </target>
@ -916,8 +922,8 @@
<target name="deploy-beta-release" description="Build and deploy the latest release files"> <target name="deploy-beta-release" description="Build and deploy the latest release files">
<input addproperty="mark" message="Mark:" /> <input addproperty="mark" message="Mark:" />
<antcall target="deploy-release"> <antcall target="deploy-release">
<param name="dir.release" location="${dir.dist}/release/${title}_${version}_${mark}" /> <param name="dir.release" location="${dir.dist}/beta/release/${title}_${version}_${mark}" />
<param name="dir.cache" location="${dir.dist}/cache/${title}_${version}_${mark}" /> <param name="dir.cache" location="${dir.dist}/beta/cache/${title}_${version}_${mark}" />
<param name="deploy.release" value="${deploy.release}/HEAD" /> <param name="deploy.release" value="${deploy.release}/HEAD" />
</antcall> </antcall>
</target> </target>

9
installer/deb/FileBot.desktop
View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=FileBot
Comment=Rename Movies or TV Shows and download Subtitles
Type=Application
Exec=/usr/share/filebot/bin/filebot.sh
Icon=/usr/share/filebot/icon.svg
Terminal=false
StartupNotify=true
Categories=AudioVideo;Video;FileTools;Java

8
installer/deb/control/control Normal file
View File

@ -0,0 +1,8 @@
Package: filebot
Version: @{version}
Architecture: @{deb.arch}
Maintainer: Reinhard Pointner <maintainer@filebot.net>
Description: The ultimate TV and Movie Renamer
Homepage: http://www.filebot.net/
Section: utils
Priority: extra

2
installer/deb/control/postinst Normal file
View File

@ -0,0 +1,2 @@
#!/bin/sh
ln -sf @{deb.prefix}/share/filebot/filebot.sh @{deb.prefix}/bin/filebot

2
installer/deb/control/prerm Normal file
View File

@ -0,0 +1,2 @@
#!/bin/sh
rm -f @{deb.prefix}/bin/filebot

9
installer/deb/deb/FileBot.desktop Normal file
View File

@ -0,0 +1,9 @@
[Desktop Entry]
Name=FileBot
Comment=The ultimate TV and Movie Renamer
Type=Application
Exec=@{deb.prefix}/share/filebot/filebot.sh
Icon=@{deb.prefix}/share/filebot/icon.svg
Terminal=false
StartupNotify=true
Categories=AudioVideo;Video;FileTools

2
installer/deb/filebot.sh → installer/deb/deb/filebot.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
APP_ROOT="/usr/share/filebot" APP_ROOT=@{deb.prefix}/share/filebot
if [ -z "$HOME" ]; then if [ -z "$HOME" ]; then
echo '$HOME must be set' echo '$HOME must be set'

2
installer/ipkg/filebot.sh → installer/deb/ipk/filebot.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
APP_ROOT="/opt/share/filebot" APP_ROOT=@{deb.prefix}/share/filebot
# make sure required environment variables are set # make sure required environment variables are set
if [ -z "$USER" ]; then if [ -z "$USER" ]; then

4
installer/deb/postinst.sh
View File

@ -1,4 +0,0 @@
#!/bin/sh
# create /bin symlink
ln -s -f /usr/share/filebot/bin/filebot.sh /usr/bin/filebot

4
installer/deb/prerm.sh
View File

@ -1,4 +0,0 @@
#!/bin/sh
# remove /bin symlink
rm -f /usr/bin/filebot

4
installer/ipkg/postinst.sh
View File

@ -1,4 +0,0 @@
#!/bin/sh
# create /bin symlink
ln -s -f /opt/share/filebot/bin/filebot.sh /opt/bin/filebot

4
installer/ipkg/prerm.sh
View File

@ -1,4 +0,0 @@
#!/bin/sh
# remove /bin symlink
rm -f /opt/bin/filebot

1
ivy.xml
View File

@ -38,5 +38,6 @@
<dependency rev="latest.release" org="org.apache.ant" name="ant-junit" /> <dependency rev="latest.release" org="org.apache.ant" name="ant-junit" />
<dependency rev="latest.release" org="org.apache.commons" name="commons-compress" /> <dependency rev="latest.release" org="org.apache.commons" name="commons-compress" />
<dependency rev="latest.release" org="net.filebot" name="ant-spk" /> <dependency rev="latest.release" org="net.filebot" name="ant-spk" />
<dependency rev="latest.release" org="org.vafer" name="jdeb" />
</dependencies> </dependencies>
</ivy-module> </ivy-module>

BIN
lib/jars/ant-deb.jar
View File

Binary file not shown.

BIN
lib/jars/ant-spk.jar
View File

Binary file not shown.