moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-23 00:08:51 -05:00
Code Issues Releases Wiki Activity

* fix deployment issues with libs not being found

Browse Source
This commit is contained in:
Reinhard Pointner 2012-02-26 18:05:07 +00:00
parent aa7fe34e59
commit 82471e029f
10 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.xml
View File

@ -141,6 +141,10 @@
<zipfileset src="${dir.lib}/jgat-custom.jar">
<include name="com/dmurph/tracking/**" />
</zipfileset>
<zipfileset src="${dir.lib}/sevenzipjbinding.jar">
<include name="net/sf/sevenzipjbinding/**" />
</zipfileset>
</jar>
</target>
@ -199,20 +203,22 @@
<target name="msi" depends="fatjar" description="Build Windows Installer for x86 and x64">
<antcall target="msi-arch">
<param name="arch" value="x86" />
<param name="libgcc_name" value="mingwm10.dll" />
</antcall>
<antcall target="msi-arch">
<param name="arch" value="x64" />
<param name="libgcc_name" value="libgcc_s_sjlj-1.dll" />
</antcall>
</target>
<target name="msi-arch">
<property name="mediainfo" location="${dir.lib}/native/win32-${arch}/MediaInfo.dll" />
<property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/lib7z-JBinding.dll" />
<property name="lib7z_gcc" location="${dir.lib}/native/win32-${arch}/lib7z-gcc.dll" />
<property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/lib7-Zip-JBinding.dll" />
<property name="libgcc_path" location="${dir.lib}/native/win32-${arch}/${libgcc_name}" />
<property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" />
<exec executable="candle.exe" dir="${dir.installer}/msi" failonerror="true">
<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -arch ${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlib7z_gcc=${lib7z_gcc}" />
<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -arch ${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlibgcc_name=${libgcc_name} -dlibgcc_path=${libgcc_path}" />
</exec>
<exec executable="light.exe" dir="${dir.installer}/msi" failonerror="true">
<arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" />

4
installer/msi/filebot-wix.xml
View File

@ -32,8 +32,8 @@
<Component Id='ApplicationBase' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E'>
<File Id='FileBot.jar' Name='FileBot.jar' Source='$(var.fatjar)' KeyPath='yes' />
<File Id='MediaInfo.dll' Name='MediaInfo.dll' Source='$(var.mediainfo)' />
<File Id='lib7z_JBinding.dll' Name='7z-JBinding.dll' Source='$(var.lib7z_binding)' />
<File Id='lib7z_gcc.dll' Name='7z-gcc.dll' Source='$(var.lib7z_gcc)' />
<File Id='lib7_Zip_JBinding.dll' Name='lib7-Zip-JBinding.dll' Source='$(var.lib7z_binding)' />
<File Id='libgcc.dll' Name='$(var.libgcc_name)' Source='$(var.libgcc_path)' />
</Component>
</Directory>
</Directory>

0
lib/native/linux-amd64/lib7z-JBinding.so → lib/native/linux-amd64/lib7-Zip-JBinding.so
View File

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

0
lib/native/mac-x86_64/lib7z-JBinding.dylib → lib/native/mac-x86_64/lib7-Zip-JBinding.dylib
View File

0
lib/native/win32-x64/lib7z-JBinding.dll → lib/native/win32-x64/lib7-Zip-JBinding.dll
View File

0
lib/native/win32-x64/lib7z-gcc.dll → lib/native/win32-x64/libgcc_s_sjlj-1.dll
View File

0
lib/native/win32-x86/lib7z-JBinding.dll → lib/native/win32-x86/lib7-Zip-JBinding.dll
View File

0
lib/native/win32-x86/lib7z-gcc.dll → lib/native/win32-x86/mingwm10.dll
View File

6
source/net/sourceforge/filebot/archive/Archive.java
View File

@ -34,13 +34,13 @@ public class Archive implements Closeable {
// initialize 7z-JBinding native libs
try {
if (Platform.isWindows()) {
System.loadLibrary("lib7z-gcc");
System.loadLibrary(Platform.is64Bit() ? "libgcc_s_sjlj-1" : "mingwm10");
}
System.loadLibrary("lib7z-JBinding");
System.loadLibrary("lib7-Zip-JBinding");
SevenZip.initLoadedLibraries();
} catch (Throwable e) {
Logger.getLogger(Archive.class.getName()).warning("Failed to load 7z-JBinding");
Logger.getLogger(Archive.class.getName()).warning("Failed to load 7z-JBinding: " + e.getMessage());
}
}