X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=3894e210d57d5d66c646773ed9874f22041e9608;hb=66eff479b11806bdcb0852c52344e9a520990921;hp=1235b766e3c0be4a79fa0f251209392d24ba2181;hpb=061fb39ecc6d06c8175f59dcdaf62e762f1688ac;p=jalview.git

diff --git a/build.xml b/build.xml
index 1235b76..3894e21 100755
--- a/build.xml
+++ b/build.xml
@@ -100,7 +100,7 @@
 		<property name="packageDir" value="dist" />
 		<property name="outputJar" value="jalview.jar" />
 		<!-- Jalview Applet JMol Jar Dependency -->
-		<property name="jmolJar" value="JmolApplet-12.0.6.jar" />
+		<property name="jmolJar" value="JmolApplet-12.1.5.jar" />
 		<property name="jalviewLiteJar" value="jalviewApplet.jar"/>
 		<!-- switch to indicate if we should obfuscate jalviewLite -->
 		<!--<property name="donotobfuscate" value="true"/> -->
@@ -251,7 +251,7 @@
 	-->
 			</information>
 			<resources>
-				<j2se version="1.4+" initial_heap_size="10M"/>
+				<j2se version="1.5+" initial_heap_size="10M"/>
 				<fileset dir="${packageDir}">
 					<include name="jalview.jar" />
 				</fileset>
@@ -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>
@@ -462,12 +462,12 @@
 
 			<target name="compileApplet" depends="init,clean">
 				<mkdir dir="${outputDir}"/>
-				<javac source="1.2"
-    target="1.1"
+				<javac source="1.5"
+    target="1.5"
     srcdir="${sourceDir}" 
     destdir="${outputDir}"
    	debug="${javac.debug}"
-    classpath="lib/${jmolJar}"
+    classpath="appletlib/${jmolJar}"
        includes="jalview/appletgui/**"
        excludes="ext/**,MCview/**,org/**,vamsas/**"
        />
@@ -493,14 +493,14 @@
 			<target name="obfuscate" depends="-obfuscatefake,-obfuscatereally" description="construct the final jalviewLite applet jar with or without obfuscation">
 			</target>
 			<target name="-obfuscatefake" depends="packageApplet" if="donotobfuscate">
-				<copy file="in.jar" tofile="${jalviewLiteJar}" />
+				<copy file="in.jar" tofile="${jalviewLiteJar}" overwrite="true"/>
 				<delete file="in.jar"/>
 			</target>
 			<target name="-obfuscatereally" unless="donotobfuscate">
 
 				<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" />
 
@@ -549,6 +549,14 @@
 						verbose="true"
 						properties="${schemaDir}/jalview.properties"
 		/>
+				<castor-srcgen file="${schemaDir}/JalviewWsParamSet.xsd"
+			      todir="${sourceDir}"
+			      package="jalview.schemabinding.version2"
+			      warnings="false" 
+				  	nodesc="false"
+						verbose="true"
+						properties="${schemaDir}/jalview.properties"
+		/>
 				<castor-srcgen file="${schemaDir}/jalview.xsd"
 			      todir="${sourceDir}"
 			      package="jalview.schemabinding.version2"
@@ -607,6 +615,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"/>