streamlined app and applet jmol console + event handling via component listener

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 1c98d05..9141683 100755 (executable)
--- 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,7 +462,15 @@
 
                        <target name="compileApplet" depends="init,clean">
                                <mkdir dir="${outputDir}"/>
-                               <javac source="1.2" target="1.1"  srcdir="${sourceDir}"  destdir="${outputDir}" debug="${javac.debug}" classpath="appletlib/${jmolJar}" includes="jalview/appletgui/**,jalview/ext/**" excludes="ext/**,MCview/**,org/**,vamsas/**,jalview/gui/**" />
+                               <javac source="1.5"
+    target="1.5"
+    srcdir="${sourceDir}" 
+    destdir="${outputDir}"
+       debug="${javac.debug}"
+    classpath="appletlib/${jmolJar}"
+       includes="jalview/appletgui/**"
+       excludes="ext/**,MCview/**,org/**,vamsas/**"
+       />
                        </target>
 
                        <target name="packageApplet" depends="compileApplet, buildPropertiesFile">
@@ -485,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">
@@ -541,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"