Split installer options and launch options

Closes qzind#771
RebeccaDeField · Mar 18, 2021 · a795fab · a795fab
1 parent d376835
commit a795fab
Show file tree

Hide file tree

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

diff --git a/ant/windows/windows-installer.nsi.in b/ant/windows/windows-installer.nsi.in
@@ -33,10 +33,10 @@ RequestExecutionLevel admin
     SetDetailsPrint textonly
     DetailPrint "Running ${step}..."
     SetDetailsPrint listonly
-    DetailPrint 'Running ${step}: "$java" ${launch.opts} -jar "$OUTDIR\${project.filename}.jar" "${step}" "${option}" "${value}"'
+    DetailPrint 'Running ${step}: "$java" ${install.opts} -jar "$OUTDIR\${project.filename}.jar" "${step}" "${option}" "${value}"'
     SetDetailsPrint both
     ClearErrors
-    nsExec::ExecToLog '"$java" ${launch.opts} -jar "$OUTDIR\${project.filename}.jar" "${step}" "${option}" "${value}"'
+    nsExec::ExecToLog '"$java" ${install.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."

diff --git a/ant/windows/windows-uninstaller.nsi.in b/ant/windows/windows-uninstaller.nsi.in
@@ -72,9 +72,9 @@ Section
     SetDetailsPrint none ; Temporarily suppress details
     SetOutPath $DELETE_DIR
     SetDetailsPrint listonly
-    DetailPrint 'Running uninstall: "$java" ${launch.opts} -jar "$DELETE_DIR\${project.filename}.jar" uninstall'
+    DetailPrint 'Running uninstall: "$java" ${install.opts} -jar "$DELETE_DIR\${project.filename}.jar" uninstall'
     ClearErrors
-    nsExec::ExecToLog '"$java" ${launch.opts} -jar "$DELETE_DIR\${project.filename}.jar" uninstall'
+    nsExec::ExecToLog '"$java" ${install.opts} -jar "$DELETE_DIR\${project.filename}.jar" uninstall'
     Pop $0
     ${If} "$0" != "0"
         Abort "Uninstall failed."