jMol jar applet dependency is now a build property and obfuscate proguard task uses...

diff --git a/build.xml b/build.xml
index d9253b0..9a855f5 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -54,7 +54,7 @@
                        </fileset> -->
       </path>
                <!-- Jalview Version String displayed by application on startup and used to check for updates -->
-      <property name="JALVIEW_VERSION" value="DEVELOPMENT"/>
+      <property name="JALVIEW_VERSION" value="2.3"/>
                <!-- Don't change anything below here unless you know what you are doing! -->
                <!-- Url path for WebStart in JNLP file -->
                <property name="WebStartLocation" value="http://www.jalview.org/webstart"/>
@@ -68,6 +68,8 @@
                <property name="outputDir" value="classes" />
                <property name="packageDir" value="dist" />
                <property name="outputJar" value="jalview.jar" />
+                <!-- Jalview Applet JMol Jar Dependency -->
+                <property name="jmolJar" value="Jmol-11.0.2.jar" />
                <!-- Jalview Web Service Clients - see the comments in 'buildextclients' for details -->
                <property name="wsdl.File" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/jpred?wsdl" />
                <property name="wsdl.Files" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/vamsas?wsdlFiles" />
@@ -94,7 +96,7 @@
                        <fileset dir="${java118.home}">
                                <include name="lib/classes.zip"/>
                        </fileset>
-               <pathelement location="lib/jmol.jar"/>
+               <pathelement location="lib/${jmolJar}"/>
          </path>
        </target>
 
@@ -346,7 +348,7 @@
     target="1.1"
     srcdir="${sourceDir}" 
     destdir="${outputDir}"
-    classpath="lib/JmolApplet.jar"
+    classpath="lib/${jmolJar}"
        includes="jalview/appletgui/**"
        excludes="ext/**,MCview/**,org/**,vamsas/**"
        />
@@ -371,13 +373,27 @@
   </target>
 
   <target name="obfuscate" depends="packageApplet">
+    <path id="obfuscateDeps.path">
+    <pathelement location="${java.home}/lib/rt.jar"/>
+    <pathelement location="lib/${jmolJar}"/>
+    </path>
     <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
     <proguard>
-      -libraryjars "${java.home}/lib/rt.jar";lib/JmolApplet.jar
+      <injar file="in.jar"/>
+      <outjar file="jalviewApplet.jar"/>
+      <libraryjar refid="obfuscateDeps.path"/>
+      <keep access="public" type="class"
+      name="jalview.bin.JalviewLite">
+        <field access="public"/>
+        <method access="public"/>
+        <constructor access="public"/>
+      </keep>
+<!--      -libraryjars "${obfuscateDeps}"
       -injars      in.jar
       -outjars     jalviewApplet.jar
       -keep public class jalview.bin.JalviewLite
        { public * ; }
+       -->
     </proguard>
     <delete file="in.jar"/>
   </target>