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

* DEB doesn't accept i686 arch values, and fails on all i686 machines saying that it doesn't match i386 ... stupid

This commit is contained in:
Reinhard Pointner 2014-10-07 17:06:37 +00:00
parent 47c3909b7b
commit 33dc1e1cd4
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build.xml
View File

@ -374,24 +374,24 @@
<property name="jre.version" value="jdk-8u20" /> <property name="jre.version" value="jdk-8u20" />
<tar destfile="${path.ubuntu-binary.tar.gz}" compression="gzip" longfile="gnu"> <tar destfile="${path.ubuntu-binary.tar.gz}" compression="gzip" longfile="gnu">
<tarfileset fullpath="i686/opt/filebot/FileBot.jar" file="${path.fatjar}" /> <tarfileset fullpath="i386/opt/filebot/FileBot.jar" file="${path.fatjar}" />
<tarfileset fullpath="x86_64/opt/filebot/FileBot.jar" file="${path.fatjar}" /> <tarfileset fullpath="x86_64/opt/filebot/FileBot.jar" file="${path.fatjar}" />
<tarfileset prefix="i686/opt/filebot" dir="${dir.lib}/native/linux-i686" includes="*.so" /> <tarfileset prefix="i386/opt/filebot" dir="${dir.lib}/native/linux-i386" includes="*.so" />
<tarfileset prefix="x86_64/opt/filebot" dir="${dir.lib}/native/linux-amd64" includes="*.so" /> <tarfileset prefix="x86_64/opt/filebot" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
<tarfileset prefix="i686/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" /> <tarfileset prefix="i386/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" />
<tarfileset prefix="x86_64/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" /> <tarfileset prefix="x86_64/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" />
<tarfileset prefix="i686/opt/filebot" dir="${dir.lib}/native/linux-i686" includes="fpcalc" filemode="755" /> <tarfileset prefix="i386/opt/filebot" dir="${dir.lib}/native/linux-i386" includes="fpcalc" filemode="755" />
<tarfileset prefix="x86_64/opt/filebot" dir="${dir.lib}/native/linux-amd64" includes="fpcalc" filemode="755" /> <tarfileset prefix="x86_64/opt/filebot" dir="${dir.lib}/native/linux-amd64" includes="fpcalc" filemode="755" />
<tarfileset fullpath="filebot.desktop" file="${dir.installer}/ubuntu/FileBot.desktop" /> <tarfileset fullpath="filebot.desktop" file="${dir.installer}/ubuntu/FileBot.desktop" />
<tarfileset fullpath="filebot.svg" file="${dir.installer}/icons/icon.svg" /> <tarfileset fullpath="filebot.svg" file="${dir.installer}/icons/icon.svg" />
<!-- Include Java 8 JRE --> <!-- Include Java 8 JRE -->
<tarfileset prefix="i686/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-i586/jre" excludes="bin/**" /> <tarfileset prefix="i386/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-i586/jre" excludes="bin/**" />
<tarfileset prefix="i686/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-i586/jre" includes="bin/java" filemode="755" /> <tarfileset prefix="i386/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-i586/jre" includes="bin/java" filemode="755" />
<tarfileset prefix="x86_64/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-x64/jre" excludes="bin/**" /> <tarfileset prefix="x86_64/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-x64/jre" excludes="bin/**" />
<tarfileset prefix="x86_64/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-x64/jre" includes="bin/java" filemode="755" /> <tarfileset prefix="x86_64/opt/filebot/jre" dir="${jre.dir}/${jre.version}-linux-x64/jre" includes="bin/java" filemode="755" />
</tar> </tar>
@ -402,10 +402,10 @@
</target> </target>
<target name="deb" description="Build debian package for i686 and amd64"> <target name="deb" description="Build debian package for i386 and amd64">
<taskdef resource="ant_deb_task.properties" classpath="${dir.lib}/build/ant-deb.jar" /> <taskdef resource="ant_deb_task.properties" classpath="${dir.lib}/build/ant-deb.jar" />
<antcall target="deb-arch"> <antcall target="deb-arch">
<param name="arch" value="i686" /> <param name="arch" value="i386" /><!-- arch i686 not allowed by deb -->
</antcall> </antcall>
<antcall target="deb-arch"> <antcall target="deb-arch">
<param name="arch" value="amd64" /> <param name="arch" value="amd64" />
@ -433,7 +433,7 @@
<param name="arch" value="arm" /> <param name="arch" value="arm" />
</antcall> </antcall>
<antcall target="ipkg-arch"> <antcall target="ipkg-arch">
<param name="arch" value="i686" /> <param name="arch" value="i386" />
</antcall> </antcall>
</target> </target>
@ -563,7 +563,7 @@
<param name="arch" value="win32-x64" /> <param name="arch" value="win32-x64" />
</antcall> </antcall>
<antcall target="webstart-nativelib"> <antcall target="webstart-nativelib">
<param name="arch" value="linux-i686" /> <param name="arch" value="linux-i386" />
</antcall> </antcall>
<antcall target="webstart-nativelib"> <antcall target="webstart-nativelib">
<param name="arch" value="linux-amd64" /> <param name="arch" value="linux-amd64" />

0
lib/native/linux-i686/fpcalc → lib/native/linux-i386/fpcalc
View File

0
lib/native/linux-i686/lib7-Zip-JBinding.so → lib/native/linux-i386/lib7-Zip-JBinding.so
View File

0
lib/native/linux-i686/libmediainfo.so → lib/native/linux-i386/libmediainfo.so
View File

0
lib/native/linux-i686/libzen.so → lib/native/linux-i386/libzen.so
View File