Remove ipk package and replace with armhf deb package
This commit is contained in:
Reinhard Pointner
parent
c0f7dc742e
commit
acf8a061bd
34
build.xml
34
build.xml
|
|
@ -548,47 +548,38 @@
|
|||
<antcall target="deb-arch">
|
||||
<param name="arch" value="amd64" />
|
||||
<param name="deb.arch" value="amd64" />
|
||||
<param name="deb.pkg" value="deb" />
|
||||
<param name="deb.prefix" value="/usr" />
|
||||
</antcall>
|
||||
|
||||
<!-- arch i686 not allowed by deb specification, must be i386 for 32-bit x86 systems -->
|
||||
<antcall target="deb-arch">
|
||||
<param name="arch" value="i686" />
|
||||
<param name="deb.arch" value="i386" />
|
||||
<param name="deb.pkg" value="deb" />
|
||||
<param name="deb.prefix" value="/usr" />
|
||||
</antcall>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="ipkg" description="Build embedded Linux packages" depends="revision">
|
||||
<!-- arch armv7l not allowed by deb specification, must be armhf for 32-bit armv7l systems -->
|
||||
<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" />
|
||||
<param name="arch" value="armv7l" />
|
||||
<param name="deb.arch" value="armhf" />
|
||||
</antcall>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="deb-arch">
|
||||
<property name="dir.staging" location="${dir.dist}/${deb.pkg}/${arch}" />
|
||||
<property name="dir.staging" location="${dir.dist}/deb/${arch}" />
|
||||
|
||||
<copy-replace todir="${dir.staging}">
|
||||
<fileset dir="${dir.installer}/deb/${deb.pkg}" />
|
||||
<fileset dir="${dir.installer}/deb" includes="control/**" />
|
||||
<fileset dir="${dir.installer}/deb" />
|
||||
</copy-replace>
|
||||
<copy todir="${dir.staging}" verbose="true" failonerror="false">
|
||||
<copy todir="${dir.staging}">
|
||||
<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" />
|
||||
<copy file="${path.fatjar}" tofile="${dir.staging}/FileBot.jar" />
|
||||
|
||||
<jdeb destfile="${dir.dist}/${package.name}_${version}_${deb.arch}.${deb.pkg}" control="${dir.staging}/control" compression="xz" changesIn="${dir.staging}/changes.txt" changesOut="${dir.dist}/${package.name}_${version}_${deb.arch}.${deb.pkg}.changes" verbose="true">
|
||||
<tarfileset prefix="${deb.prefix}/share/filebot" dir="${dir.staging}" includes="*.sh, fpcalc" filemode="755" />
|
||||
<tarfileset prefix="${deb.prefix}/share/filebot" dir="${dir.staging}" includes="*.jar, *.so, *.svg" />
|
||||
<tarfileset prefix="${deb.prefix}/share/applications" dir="${dir.staging}" includes="*.desktop" />
|
||||
<jdeb destfile="${dir.dist}/${package.name}_${version}_${deb.arch}.deb" control="${dir.staging}/control" compression="xz" changesIn="${dir.staging}/changes.txt" changesOut="${dir.dist}/${package.name}_${version}_${deb.arch}.deb.changes" verbose="true">
|
||||
<tarfileset prefix="/usr/share/filebot" dir="${dir.staging}" includes="*.sh, fpcalc" filemode="755" />
|
||||
<tarfileset prefix="/usr/share/filebot" dir="${dir.staging}" includes="*.jar, *.so, *.svg" />
|
||||
<tarfileset prefix="/usr/share/applications" dir="${dir.staging}" includes="*.desktop" />
|
||||
</jdeb>
|
||||
</target>
|
||||
|
||||
|
|
@ -780,7 +771,7 @@
|
|||
</target>
|
||||
|
||||
|
||||
<target name="stage-release" depends="fatjar, spk, deb, ipkg, portable, appbundle, msi">
|
||||
<target name="stage-release" depends="fatjar, spk, deb, portable, appbundle, msi">
|
||||
<!-- ensure clean release dir -->
|
||||
<delete dir="${dir.release}" />
|
||||
<mkdir dir="${dir.release}" />
|
||||
|
|
@ -792,7 +783,6 @@
|
|||
<include name="*.tar.xz" />
|
||||
<include name="*.msi" />
|
||||
<include name="*.deb" />
|
||||
<include name="*.ipk" />
|
||||
<include name="*.spk" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
APP_ROOT=@{deb.prefix}/share/filebot
|
||||
APP_ROOT=/usr/share/filebot
|
||||
|
||||
if [ -z "$HOME" ]; then
|
||||
echo '$HOME must be set'
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
#!/bin/sh
|
||||
APP_ROOT=@{deb.prefix}/share/filebot
|
||||
|
||||
# make sure required environment variables are set
|
||||
if [ -z "$USER" ]; then
|
||||
export USER=`whoami`
|
||||
fi
|
||||
|
||||
# force JVM language and encoding settings
|
||||
export LANG="C.UTF-8"
|
||||
export LC_ALL="C.UTF-8"
|
||||
|
||||
# add APP_ROOT to LD_LIBRARY_PATH
|
||||
if [ ! -z "$LD_LIBRARY_PATH" ]; then
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$APP_ROOT"
|
||||
else
|
||||
export LD_LIBRARY_PATH="$APP_ROOT"
|
||||
fi
|
||||
|
||||
# choose extractor
|
||||
EXTRACTOR="ApacheVFS" # use Apache Commons VFS2 with junrar plugin
|
||||
# EXTRACTOR="SevenZipExecutable" # use the 7z executable
|
||||
# EXTRACTOR="SevenZipNativeBindings" # use the lib7-Zip-JBinding.so native library
|
||||
|
||||
# select application data folder
|
||||
APP_DATA="$APP_ROOT/data/$USER"
|
||||
|
||||
# start filebot
|
||||
java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dsun.jnu.encoding="UTF-8" -Dapplication.deployment=ipkg -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/temp" -Duser.home="$APP_DATA" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@"
|
||||
|
|
@ -22,8 +22,6 @@ if ($type == 'nsis') {
|
|||
$file = 'filebot_'.$version.'_'.$arch.'.deb';
|
||||
} else if ($type == 'portable') {
|
||||
$file = 'FileBot_'.$version.'-portable.tar.xz';
|
||||
} else if ($type == 'ipkg') {
|
||||
$file = 'filebot_'.$version.'_noarch.ipk';
|
||||
} else {
|
||||
$folder = 'https://sourceforge.net/projects/filebot/files/filebot/FileBot_'.$version; // redirect to latest release folder by default
|
||||
}
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@
|
|||
<li class="macappstore" style="display:none">FileBot command-line tools for Mac are available <a target="_blank" href="https://www.filebot.net/forums/viewtopic.php?t=2049">via brew cask</a></li>
|
||||
<li class="nsis" style="display:none">Windows installer: <a target="_blank" href="https://app.filebot.net/files/FileBot-setup.exe">FileBot_@{version}-setup.exe</a> <small class="comment">for Windows 8 and earlier</small></li>
|
||||
<li>Debian packages: <a target="_blank" href="https://app.filebot.net/download.php?type=deb&arch=i386&version=@{version}">filebot_@{version}_i386.deb</a> or <a target="_blank" href="https://app.filebot.net/download.php?type=deb&arch=amd64&version=@{version}">filebot_@{version}_amd64.deb</a></li>
|
||||
<li>Embedded Linux package: <a target="_blank" href="https://app.filebot.net/download.php?type=ipkg&arch=noarch&version=@{version}">filebot_@{version}_noarch.ipk</a></li>
|
||||
<li>Embedded Linux package: <a target="_blank" href="https://app.filebot.net/download.php?type=deb&arch=armhf&version=@{version}">filebot_@{version}_armhf.deb</a>
|
||||
<li>Portable package: <a target="_blank" href="https://app.filebot.net/download.php?type=portable&version=@{version}">FileBot-@{version}-portable.tar.xz</a>
|
||||
<ul>
|
||||
<li>This package does not include the <a href="https://github.com/filebot/filebot/tree/master/lib/native" target="_blank">MediaInfo and 7-Zip native libraries</a></li>
|
||||
|
|
|
|||
Loading…
Reference in New Issue