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

* try to fix loadLibrary issues with mac/linux

This commit is contained in:
Reinhard Pointner 2012-03-03 01:41:47 +00:00
parent 4f6663a385
commit f66b6fe23a
7 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -213,7 +213,7 @@
<target name="msi-arch"> <target name="msi-arch">
<property name="mediainfo" location="${dir.lib}/native/win32-${arch}/MediaInfo.dll" /> <property name="mediainfo" location="${dir.lib}/native/win32-${arch}/MediaInfo.dll" />
<property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/lib7-Zip-JBinding.dll" /> <property name="lib7z_binding" location="${dir.lib}/native/win32-${arch}/7-Zip-JBinding.dll" />
<property name="libgcc_path" location="${dir.lib}/native/win32-${arch}/${libgcc_name}" /> <property name="libgcc_path" location="${dir.lib}/native/win32-${arch}/${libgcc_name}" />
<property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" /> <property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" />

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

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

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

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

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

@ -44,7 +44,7 @@ public class Archive implements Closeable {
System.loadLibrary(Platform.is64Bit() ? "libgcc_s_sjlj-1" : "mingwm10"); System.loadLibrary(Platform.is64Bit() ? "libgcc_s_sjlj-1" : "mingwm10");
} }
System.loadLibrary("lib7-Zip-JBinding"); System.loadLibrary("7-Zip-JBinding");
SevenZip.initLoadedLibraries(); SevenZip.initLoadedLibraries();
nativeLibrariesLoaded = true; nativeLibrariesLoaded = true;
} catch (Throwable e) { } catch (Throwable e) {

2
website/index.html
View File

@ -200,7 +200,7 @@
<ul class="list"> <ul class="list">
<li>Executable Jar: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.jar'])" target="_blank" href="download.php?type=jar">FileBot_@{version}.jar</a> (<strong>12.5MB</strong>) <small class="comment">for Windows, Linux, Mac OS X, BSD and Solaris</small> <li>Executable Jar: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.jar'])" target="_blank" href="download.php?type=jar">FileBot_@{version}.jar</a> (<strong>12.5MB</strong>) <small class="comment">for Windows, Linux, Mac OS X, BSD and Solaris</small>
<ul> <ul>
<li>This package does not include the <a href="http://mediainfo.sourceforge.net/en/Download" target="_blank">MediaInfo native libraries</a>. <small class="comment">32-bit JRE requires 32-bit native libs</small></li> <li>This package does not include the <a href="http://filebot.svn.sourceforge.net/viewvc/filebot/trunk/lib/native/" target="_blank">MediaInfo and 7-Zip native libraries</a>. <small class="comment">32-bit JRE requires 32-bit native libs</small></li>
</ul> </ul>
</li> </li>
<li>Mac OS X app bundle: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.app'])" target="_blank" href="download.php?type=app">FileBot_@{version}.app</a> (<strong>15MB</strong>)</li> <li>Mac OS X app bundle: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.app'])" target="_blank" href="download.php?type=app">FileBot_@{version}.app</a> (<strong>15MB</strong>)</li>