Guard against conflicting JNA version

Allow installer and app to run even when a newer version of JNA is installed on $PATH Closes #577
qzind · Feb 10, 2020 · dfb0d18 · dfb0d18
1 parent 44a4124
commit dfb0d18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ant/project.properties b/ant/project.properties
@@ -7,7 +7,7 @@ project.name=QZ Tray
 project.filename=qz-tray
 project.datadir=qz
 
-launch.opts=-Xms512m
+launch.opts=-Xms512m -Djna.nosys=true
 
 src.dir=${basedir}/src
 out.dir=${basedir}/out

diff --git a/ant/windows/windows-installer.nsi.in b/ant/windows/windows-installer.nsi.in
@@ -36,10 +36,10 @@ RequestExecutionLevel admin
     SetDetailsPrint textonly
     DetailPrint "Running ${step}..."
     SetDetailsPrint listonly
-    DetailPrint 'Running ${step}: $java -jar "$OUTDIR\${project.filename}.jar" "${step}" "${option}" "${value}"'
+    DetailPrint 'Running ${step}: $java ${launch.opts} -jar "$OUTDIR\${project.filename}.jar" "${step}" "${option}" "${value}"'
     SetDetailsPrint both
     ClearErrors
-    nsExec::ExecToLog '$java -jar "$OUTDIR\${project.filename}.jar" "${step}" "${option}" "${value}"'
+    nsExec::ExecToLog '$java ${launch.opts} -jar "$OUTDIR\${project.filename}.jar" "${step}" "${option}" "${value}"'
     Pop $0
     ${If} "$0" != "0"
         Abort "Installation failed during ${step} step.  Please check log for details."