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

Automate native library updates

This commit is contained in:
Reinhard Pointner 2016-03-23 14:57:52 +00:00
parent 9fe67fbc7c
commit e82c887fa6
7 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
build.xml
View File

@ -39,6 +39,69 @@
<target name="resolve" description="Retrieve dependencies with Apache Ivy"> <target name="resolve" description="Retrieve dependencies with Apache Ivy">
<delete dir="${dir.lib}/ivy" /> <delete dir="${dir.lib}/ivy" />
<ivy:retrieve pattern="${dir.lib}/ivy/[type]/[artifact].[ext]" /> <ivy:retrieve pattern="${dir.lib}/ivy/[type]/[artifact].[ext]" />
<antcall target="resolve-import-native">
<param name="arch" value="mac-x86_64" />
<param name="arch.jna" value="darwin" />
<param name="arch.7zj" value="Mac-x86_64" />
</antcall>
<antcall target="resolve-import-native">
<param name="arch" value="win32-x64" />
<param name="arch.jna" value="win32-x86-64" />
<param name="arch.7zj" value="Windows-amd64" />
</antcall>
<antcall target="resolve-import-native">
<param name="arch" value="win32-x86" />
<param name="arch.jna" value="win32-x86/" />
<param name="arch.7zj" value="Windows-x86" />
</antcall>
<antcall target="resolve-import-native">
<param name="arch" value="linux-amd64" />
<param name="arch.jna" value="linux-x86-64" />
<param name="arch.7zj" value="Linux-amd64" />
</antcall>
<antcall target="resolve-import-native">
<param name="arch" value="linux-i686" />
<param name="arch.jna" value="linux-x86" />
<param name="arch.7zj" value="Linux-i386" />
</antcall>
<antcall target="resolve-import-native">
<param name="arch" value="linux-arm" />
<param name="arch.jna" value="linux-arm" />
<param name="arch.7zj" value="Linux-arm" />
</antcall>
</target>
<target name="resolve-import-native">
<unzip src="${dir.lib}/ivy/jar/jna.jar" dest="${dir.lib}/native/${arch}" overwrite="yes">
<patternset>
<include name="**/${arch.jna}/*.dll" />
<include name="**/${arch.jna}/*.so" />
<include name="**/${arch.jna}/*.jnilib" />
</patternset>
<chainedmapper>
<flattenmapper />
<compositemapper>
<globmapper from="*.jnilib" to="*.dylib" />
<identitymapper />
</compositemapper>
</chainedmapper>
</unzip>
<unzip src="${dir.lib}/ivy/jar/sevenzipjbinding-all-platforms.jar" dest="${dir.lib}/native/${arch}" overwrite="yes">
<patternset>
<include name="**/${arch.7zj}/*.dll" />
<include name="**/${arch.7zj}/*.so" />
<include name="**/${arch.7zj}/*.dylib" />
</patternset>
<chainedmapper>
<flattenmapper />
<compositemapper>
<globmapper from="lib*.dll" to="*.dll" />
<identitymapper />
</compositemapper>
</chainedmapper>
</unzip>
</target> </target>

BIN
lib/native/linux-amd64/libjnidispatch.so Normal file
View File

Binary file not shown.

BIN
lib/native/linux-arm/libjnidispatch.so Normal file
View File

Binary file not shown.

BIN
lib/native/linux-i686/libjnidispatch.so Normal file
View File

Binary file not shown.

0
lib/native/win32-x64/libgcc_s_seh-1.dll → lib/native/win32-x64/gcc_s_seh-1.dll
View File

0
lib/native/win32-x86/libgcc_s_seh-1.dll → lib/native/win32-x86/gcc_s_seh-1.dll
View File

2
source/net/filebot/archive/SevenZipLoader.java
View File

@ -23,7 +23,7 @@ public class SevenZipLoader {
try { try {
try { try {
if (Platform.isWindows() && Platform.is64Bit()) { if (Platform.isWindows() && Platform.is64Bit()) {
System.loadLibrary("libgcc_s_seh-1"); System.loadLibrary("gcc_s_seh-1");
} }
} catch (Throwable e) { } catch (Throwable e) {
debug.warning("Failed to preload library: " + e); debug.warning("Failed to preload library: " + e);