From: Ben Soares <bsoares@dundee.ac.uk>
Date: Wed, 1 May 2019 16:36:52 +0000 (+0100)
Subject: Fixed -Djvl=true in install4j JVM invocation
X-Git-Tag: Release_2_11_0~15^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c942a74c0b847a286dbfd44de75afac99520d641;p=jalview.git

Fixed -Djvl=true in install4j JVM invocation
---

diff --git a/.gitignore b/.gitignore
index e7a6bb8..84f4385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,8 @@ TESTNG
 /getdown/website
 /getdown/full_app
 /getdown/files
+/getdown/src/getdown/*/target/
+/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Build.java
 /utils/install4j/jalview-installers-*.install4j
 *.swp
 /bin
diff --git a/utils/install4j/install4j_template.install4j b/utils/install4j/install4j_template.install4j
index d848567..540d736 100644
--- a/utils/install4j/install4j_template.install4j
+++ b/utils/install4j/install4j_template.install4j
@@ -159,7 +159,7 @@
           <versionLine x="85" y="109" text="version ${compiler:sys.version}" fontSize="8" fontColor="0,0,0" bold="false" />
         </text>
       </splashScreen>
-      <java mainClass="com.threerings.getdown.launcher.GetdownApp" mainMode="1" vmParameters="" arguments="-Djvl=true ." allowVMPassthroughParameters="true" preferredVM="" bundleRuntime="true">
+      <java mainClass="com.threerings.getdown.launcher.GetdownApp" mainMode="1" vmParameters="-Djvl=true" arguments="." allowVMPassthroughParameters="true" preferredVM="" bundleRuntime="true">
         <classPath>
           <archive location="getdown-launcher.jar" failOnError="true" />
         </classPath>
@@ -718,7 +718,7 @@ return console.askOkCancel(message, true);
                 </serializedBean>
                 <condition />
               </action>
-              <action name="" id="576" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.AddToDockAction" enabled="false" commentSet="false" comment="" actionElevationType="none" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="">
+              <action name="" id="576" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.AddToDockAction" enabled="true" commentSet="false" comment="" actionElevationType="none" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.AddToDockAction" />