From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 11 Apr 2007 14:29:44 +0000 (+0000)
Subject: Modified to compile applet with Jmol jar present
X-Git-Tag: Release_2_3~253
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ae3cd33091bdea07c9137d33dea108e80ac27f36;p=jalview.git

Modified to compile applet with Jmol jar present
---

diff --git a/build.xml b/build.xml
index 0226383..d216910 100755
--- a/build.xml
+++ b/build.xml
@@ -53,7 +53,7 @@
         </fileset> -->
       </path>
       <!-- Jalview Version String displayed by application on startup and used to check for updates -->
-      <property name="JALVIEW_VERSION" value="2.2"/>
+      <property name="JALVIEW_VERSION" value="DEVELOPMENT"/>
       <!-- 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"/>
@@ -331,9 +331,15 @@
 
   <target name="compileApplet" depends="init,clean">
     <mkdir dir="${outputDir}"/>
-    <javac source="1.2" target="1.1" srcdir="${sourceDir}" destdir="${outputDir}"
-       includes="jalview/analysis/**,jalview/appletgui/**,jalview/datamodel/**jalview/jbappletgui/**,jalview/math/**,jalview/schemes/**"
-       excludes="ext/**,MCview/**,org/**,vamsas/**"/>
+    <javac source="1.2"
+    target="1.1"
+    srcdir="${sourceDir}" 
+    destdir="${outputDir}"
+    classpath="lib/jmol.jar"
+       includes="jalview/appletgui/**"
+       excludes="ext/**,MCview/**,org/**,vamsas/**"
+       
+       />
   </target>
 
   <target name="packageApplet" depends="compileApplet, buildPropertiesFile">
@@ -357,7 +363,7 @@
   <target name="obfuscate" depends="packageApplet">
     <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
     <proguard>
-      -libraryjars "${java.home}/lib/rt.jar"
+      -libraryjars "${java.home}/lib/rt.jar" lib/jmol.jar
       -injars      in.jar
       -outjars     jalviewApplet.jar
       -keep public class jalview.bin.JalviewLite