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

* try to fix various potential JNA init issues

This commit is contained in:
Reinhard Pointner 2013-11-22 08:28:17 +00:00
parent e1b6af2616
commit e1c8e8d17b
7 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.xml
View File

@ -320,6 +320,7 @@
</target> </target>
<target name="msi-arch"> <target name="msi-arch">
<property name="jnidispatch" location="${dir.lib}/native/win32-${arch}/jnidispatch.dll" />
<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}/7-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}" />
@ -327,7 +328,7 @@
<property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" /> <property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" />
<exec executable="candle.exe" dir="${dir.installer}/msi" failonerror="true"> <exec executable="candle.exe" dir="${dir.installer}/msi" failonerror="true">
<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -darch=${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlibgcc_name=${libgcc_name} -dlibgcc_path=${libgcc_path} -dfpcalc_path=${fpcalc_path}" /> <arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -darch=${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -djnidispatch=${jnidispatch} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlibgcc_name=${libgcc_name} -dlibgcc_path=${libgcc_path} -dfpcalc_path=${fpcalc_path}" />
</exec> </exec>
<exec executable="light.exe" dir="${dir.installer}/msi" failonerror="true"> <exec executable="light.exe" dir="${dir.installer}/msi" failonerror="true">
<arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" /> <arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" />

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

@ -51,6 +51,7 @@
<Component Id='ApplicationBase' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E' Win64="$(var.Win64)"> <Component Id='ApplicationBase' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E' Win64="$(var.Win64)">
<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='jnidispatch.dll' Name='jnidispatch.dll' Source='$(var.jnidispatch)' />
<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='7-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)' />

3
installer/msi/filebot.l4j.ini
View File

@ -2,6 +2,9 @@
-Dapplication.deployment=msi -Dapplication.deployment=msi
-Dapplication.dir="%APPDATA%\FileBot" -Dapplication.dir="%APPDATA%\FileBot"
# put all temporary files here
-Djava.io.tmpdir="%APPDATA%\FileBot\temp"
# FileBot feature settings # FileBot feature settings
-Dapplication.analytics=true -Dapplication.analytics=true

3
installer/msi/filebot.launcher.l4j.ini
View File

@ -2,6 +2,9 @@
-Dapplication.deployment=msi -Dapplication.deployment=msi
-Dapplication.dir="%APPDATA%\FileBot" -Dapplication.dir="%APPDATA%\FileBot"
# put all temporary files here
-Djava.io.tmpdir="%APPDATA%\FileBot\temp"
# FileBot feature settings # FileBot feature settings
-Dapplication.warmup=false -Dapplication.warmup=false
-Dapplication.analytics=true -Dapplication.analytics=true

3
installer/msi/filebot.platform.launcher.l4j.ini
View File

@ -2,6 +2,9 @@
-Dapplication.deployment=msi -Dapplication.deployment=msi
-Dapplication.dir="%APPDATA%\FileBot" -Dapplication.dir="%APPDATA%\FileBot"
# put all temporary files here
-Djava.io.tmpdir="%APPDATA%\FileBot\temp"
# FileBot system properties # FileBot system properties
-DthreadPool=8 -DthreadPool=8
-Dunixfs=false -Dunixfs=false

BIN
lib/native/win32-x64/jnidispatch.dll Normal file
View File

Binary file not shown.

BIN
lib/native/win32-x86/jnidispatch.dll Normal file
View File

Binary file not shown.