From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 5 Sep 2018 12:57:15 +0000 (+0100)
Subject: JAL-3101 increase default heap size in IA and JNLP generation, and generate a jalview... 
X-Git-Tag: Release_2_10_5~19
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b429528b02ed00f6fe30fead05ed78c9d01ea055;p=jalview.git

JAL-3101 increase default heap size in IA and JNLP generation, and generate a jalview_256MB.jnlp file for backwards compatibility
---

diff --git a/build.xml b/build.xml
index 97f459d..957684b 100755
--- a/build.xml
+++ b/build.xml
@@ -355,10 +355,15 @@
     </jar>
 
     <antcall target="writejnlpf">
-      <param name="jnlpFile" value="${packageDir}/jalview.jnlp" />
+      <param name="jnlpFile" value="${packageDir}/jalview_256M.jnlp" />
       <param name="inih" value="10M" />
       <param name="maxh" value="256M" />
     </antcall>
+    <antcall target="writejnlpf">
+      <param name="jnlpFile" value="${packageDir}/jalview.jnlp" />
+      <param name="inih" value="800M" />
+      <param name="maxh" value="1024M" />
+    </antcall>
 
     <antcall target="writejnlpf">
       <param name="jnlpFile" value="${packageDir}/jalview_1G.jnlp" />
@@ -368,7 +373,7 @@
 
     <antcall target="writejnlpf">
       <param name="jnlpFile" value="${packageDir}/jalview_2G.jnlp" />
-      <param name="inih" value="256M" />
+      <param name="inih" value="800M" />
       <param name="maxh" value="1024M" />
     </antcall>
 
diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index 944e725..a3be720 100755
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -200,7 +200,7 @@ Can be separated by colons (Mac OS/Unix) or semicolons (Windows)]]></string>
 							<method name="addElement">
 								<object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="97fa91cfa6f7">
 									<property name="propertyValue">
-										<string><![CDATA[268400000]]></string>
+										<string><![CDATA[1060000000]]></string>
 									</property>
 									<property name="propertyName">
 										<string><![CDATA[lax.nl.java.option.java.heap.size.max]]></string>
@@ -254,7 +254,7 @@ it will search for ones in this list]]></string>
 							<method name="addElement">
 								<object class="com.zerog.ia.installer.util.LAXPropertyData" objectID="97f991ffa6f7">
 									<property name="propertyValue">
-										<string><![CDATA[33554432]]></string>
+										<string><![CDATA[1000000000]]></string>
 									</property>
 									<property name="propertyName">
 										<string><![CDATA[lax.nl.java.option.java.heap.size.initial]]></string>