X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build.xml;h=ae3dcec6f234886adf94e4beb9334db66452d2f1;hb=cdb2c3afc153577cceb0d5c6a4b12532f6dde601;hp=e9b513772af3a4a05219509b9791e1190fa9636d;hpb=bc2d774a0e91eb603b1070a1a0db772770293c88;p=jalview.git

diff --git a/build.xml b/build.xml
index e9b5137..ae3dcec 100755
--- a/build.xml
+++ b/build.xml
@@ -291,7 +291,7 @@
 		-->
 				</information>
 				<resources>
-					<j2se version="1.4+" initial_heap_size="64M" max_heap_size="512M"/>
+					<j2se version="1.5+" initial_heap_size="64M" max_heap_size="512M"/>
 					<fileset dir="${packageDir}">
 						<include name="jalview.jar" />
 					</fileset>
@@ -330,7 +330,7 @@
 			-->
 					</information>
 					<resources>
-						<j2se version="1.4+" initial_heap_size="256M" max_heap_size="1024M"/>
+						<j2se version="1.5+" initial_heap_size="256M" max_heap_size="1024M"/>
 						<fileset dir="${packageDir}">
 							<include name="jalview.jar" />
 						</fileset>
@@ -467,7 +467,7 @@
     srcdir="${sourceDir}" 
     destdir="${outputDir}"
    	debug="${javac.debug}"
-    classpath="lib/${jmolJar}"
+    classpath="appletlib/${jmolJar}"
        includes="jalview/appletgui/**"
        excludes="ext/**,MCview/**,org/**,vamsas/**"
        />
@@ -500,7 +500,7 @@
 
 				<path id="obfuscateDeps.path">
 					<pathelement location="${applet.jre.tools}"/>
-					<pathelement location="lib/${jmolJar}"/>
+					<pathelement location="appletlib/${jmolJar}"/>
 				</path>
 				<taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
 
@@ -607,6 +607,7 @@
 						<include name="${libDir}/**/*"/>
 						<include name="${resourceDir}/**/*"/>
 						<include name="${helpDir}/**/*"/>
+						<include name="appletlib/${jmolJar}"/>
 						<exclude name="**/*locales"/>
 						<exclude name="*locales/**"/>
 						<exclude name="utils/InstallAnywhere/**Build.iap_xml"/>