X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=91416835ddf05a2eae4c1a02b5c134982b881b4a;hb=4c5b46336a4a57c09b4a1d2ab13c81b0958a6c9e;hp=ded70087dcf9b7840c0d0a474d1473628e392979;hpb=f98565987df73493376993566bad1784d9c75e84;p=jalview.git

diff --git a/build.xml b/build.xml
index ded7008..9141683 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.11_dev.jar" />
 		<property name="jalviewLiteJar" value="jalviewApplet.jar"/>
 		<!-- switch to indicate if we should obfuscate jalviewLite -->
 		<!--<property name="donotobfuscate" value="true"/> -->
@@ -462,14 +462,14 @@
 
 			<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="appletlib/${jmolJar}"
-       includes="jalview/appletgui/**,jalview/ext/**"
-       excludes="ext/**,MCview/**,org/**,vamsas/**,jalview/gui/**"
+       includes="jalview/appletgui/**"
+       excludes="ext/**,MCview/**,org/**,vamsas/**"
        />
 			</target>
 
@@ -493,7 +493,7 @@
 			<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">
@@ -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"