From ad09eb8ae793fa239185b24fd7d88d4ca537f3f5 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Mon, 7 Nov 2016 15:04:31 +0800
Subject: [PATCH] # make sure to use the bundled JNA library -Djna.nosys=true
 -Djna.nounpack=true

---
 installer/appx/filebot.l4j.ini                  |  7 ++++++-
 installer/appx/filebot.launcher.l4j.ini         |  7 ++++++-
 installer/msi/filebot.l4j.ini                   |  6 +++++-
 installer/msi/filebot.launcher.l4j.ini          |  6 +++++-
 installer/msi/filebot.platform.launcher.l4j.ini | 17 ++++++++++++-----
 5 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/installer/appx/filebot.l4j.ini b/installer/appx/filebot.l4j.ini
index ae529a28..046f9989 100644
--- a/installer/appx/filebot.l4j.ini
+++ b/installer/appx/filebot.l4j.ini
@@ -1,6 +1,7 @@
 # FileBot launch4j runtime config
--Dapplication.deployment=appx
 -Dapplication.dir="%APPDATA%\FileBot"
+-Dapplication.deployment=appx
+-Dapplication.update=skip
 
 # put all temporary files here
 -Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
@@ -23,6 +24,10 @@
 -Djna.boot.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
 
+# make sure to use the bundled JNA library
+-Djna.nosys=true
+-Djna.nounpack=true
+
 # reduce default logging
 -Djava.util.logging.config.file="%EXEDIR%\logging.properties"
 
diff --git a/installer/appx/filebot.launcher.l4j.ini b/installer/appx/filebot.launcher.l4j.ini
index 1da55ed1..7eaa15ec 100644
--- a/installer/appx/filebot.launcher.l4j.ini
+++ b/installer/appx/filebot.launcher.l4j.ini
@@ -1,6 +1,7 @@
 # FileBot launch4j runtime config
--Dapplication.deployment=appx
 -Dapplication.dir="%APPDATA%\FileBot"
+-Dapplication.deployment=appx
+-Dapplication.update=skip
 
 # put all temporary files here
 -Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
@@ -23,6 +24,10 @@
 -Djna.boot.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
 
+# make sure to use the bundled JNA library
+-Djna.nosys=true
+-Djna.nounpack=true
+
 # reduce default logging
 -Djava.util.logging.config.file="%EXEDIR%\logging.properties"
 
diff --git a/installer/msi/filebot.l4j.ini b/installer/msi/filebot.l4j.ini
index 8a51ad18..9bf460da 100644
--- a/installer/msi/filebot.l4j.ini
+++ b/installer/msi/filebot.l4j.ini
@@ -1,6 +1,6 @@
 # FileBot launch4j runtime config
--Dapplication.deployment=msi
 -Dapplication.dir="%APPDATA%\FileBot"
+-Dapplication.deployment=msi
 
 # put all temporary files here
 -Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
@@ -23,5 +23,9 @@
 -Djna.boot.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
 
+# make sure to use the bundled JNA library
+-Djna.nosys=true
+-Djna.nounpack=true
+
 # reduce default logging
 -Djava.util.logging.config.file="%EXEDIR%\logging.properties"
diff --git a/installer/msi/filebot.launcher.l4j.ini b/installer/msi/filebot.launcher.l4j.ini
index 97cfb41a..9cf4c7ac 100644
--- a/installer/msi/filebot.launcher.l4j.ini
+++ b/installer/msi/filebot.launcher.l4j.ini
@@ -1,6 +1,6 @@
 # FileBot launch4j runtime config
--Dapplication.deployment=msi
 -Dapplication.dir="%APPDATA%\FileBot"
+-Dapplication.deployment=msi
 
 # put all temporary files here
 -Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
@@ -23,5 +23,9 @@
 -Djna.boot.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
 
+# make sure to use the bundled JNA library
+-Djna.nosys=true
+-Djna.nounpack=true
+
 # reduce default logging
 -Djava.util.logging.config.file="%EXEDIR%\logging.properties"
diff --git a/installer/msi/filebot.platform.launcher.l4j.ini b/installer/msi/filebot.platform.launcher.l4j.ini
index 5ebad4c7..2c8a7904 100644
--- a/installer/msi/filebot.platform.launcher.l4j.ini
+++ b/installer/msi/filebot.platform.launcher.l4j.ini
@@ -1,10 +1,10 @@
 # FileBot launch4j runtime config
--Dapplication.deployment=msi
 -Dapplication.dir="%APPDATA%\FileBot"
+-Dapplication.deployment=msi
 -Dapplication.help=skip
 
 # put all temporary files here
--Djava.io.tmpdir="%APPDATA%\FileBot\temp"
+-Djava.io.tmpdir="%APPDATA%\FileBot\tmp"
 
 # FileBot system properties
 -DthreadPool=32
@@ -19,13 +19,20 @@
 -DuseExtendedFileAttributes=false
 -DuseCreationDate=false
 
-# look for native libs here
+# look for executables in the application folder
+-Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+
+# look for native libraries in the application folder
 -Djna.library.path="%EXEDIR%"
 -Djna.boot.library.path="%EXEDIR%"
 -Djava.library.path="%EXEDIR%"
 
-# look for fpcalc here
--Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
+# make sure to use the bundled JNA library
+-Djna.nosys=true
+-Djna.nounpack=true
+
+# reduce default logging
+-Djava.util.logging.config.file="%EXEDIR%\logging.properties"
 
 # use Java implementation for extracting archives
 -Dnet.filebot.Archive.extractor="ApacheVFS"