9th may

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index b415140..d9253b0 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -23,6 +23,7 @@
                <echo message="compileApplet - compiles all necessary files for Applet"/>
                <echo message="makeApplet - compiles, then packages and obfuscates the Applet"/>
                <echo message="See docs/building.html and the comments in build file for other targets."/>
+           <echo message="note: compile and makeApplet require the property java118.home to be set to point to a java 1.1.8 jdk."/>
        </target>
 
 
@@ -86,6 +87,15 @@
                                <include name="**/*.jar"/>
                        </fileset>
                </path>
+               <!-- The Location of the java 1.1.8 jdk -->
+               <property name="java118.home" value="C:\Sun\jdk1.1.8" />
+               <!-- the classpath for building the 1.1 applet -->
+               <path id="jalviewlite.deps">
+                       <fileset dir="${java118.home}">
+                               <include name="lib/classes.zip"/>
+                       </fileset>
+               <pathelement location="lib/jmol.jar"/>
+         </path>
        </target>
 
 
@@ -327,55 +337,50 @@
 
 
 
-       <!-- Compile, package and obfuscate Jalview Applet -->
-       <target name="makeApplet" depends="obfuscate"/>
+  <!-- Compile, package and obfuscate Jalview Applet -->
+  <target name="makeApplet" depends="obfuscate"/>
 
-       <target name="compileApplet" depends="init,clean">
-               <mkdir dir="${outputDir}"/>
+  <target name="compileApplet" depends="init,clean">
+    <mkdir dir="${outputDir}"/>
     <javac source="1.2"
     target="1.1"
     srcdir="${sourceDir}" 
     destdir="${outputDir}"
-    classpath="lib/jmol.jar"
+    classpath="lib/JmolApplet.jar"
        includes="jalview/appletgui/**"
        excludes="ext/**,MCview/**,org/**,vamsas/**"
-       
        />
-       </target>
-
-       <target name="packageApplet" depends="compileApplet, buildPropertiesFile">
-               <copy file="${resourceDir}/images/idwidth.gif" toFile="${outputDir}/images/idwidth.gif"/>
-               <copy file="${resourceDir}/images/link.gif" toFile="${outputDir}/images/link.gif"/>
-               <jar destfile="in.jar">
-                       <manifest>
-                               <attribute name="Main-Class" value="jalview.bin.JalviewLite"/>
-                       </manifest>
-                       <fileset dir="${outputDir}">
-                               <include name="com/**"/>
-                               <include name="MCview/**"/>
-                               <include name="jalview/**"/>
-                               <include name=".build_properties"/>
-                               <include name="images/idwidth.gif"/>
-                               <include name="images/link.gif"/>
-                       </fileset>
-               </jar>
-       </target>
-
-       <target name="obfuscate" depends="packageApplet">
-               <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
-               <path id="jalviewlite.deps">
-                       <pathelement location="${java.home}/lib/rt.jar"/>
-                       <pathelement location="lib/jmol.jar"/>
-               </path>
-               <proguard>
-                       <libraryjar refid="jalviewlite.deps"/>
+  </target>
+
+  <target name="packageApplet" depends="compileApplet, buildPropertiesFile">
+  <copy file="${resourceDir}/images/idwidth.gif" toFile="${outputDir}/images/idwidth.gif"/>
+  <copy file="${resourceDir}/images/link.gif" toFile="${outputDir}/images/link.gif"/>
+       <jar destfile="in.jar">
+        <manifest>
+            <attribute name="Main-Class" value="jalview.bin.JalviewLite"/>
+        </manifest>
+        <fileset dir="${outputDir}">
+          <include name="com/**"/>
+          <include name="MCview/**"/>
+          <include name="jalview/**"/>
+          <include name=".build_properties"/>
+          <include name="images/idwidth.gif"/>
+          <include name="images/link.gif"/>
+        </fileset>
+      </jar>
+  </target>
+
+  <target name="obfuscate" depends="packageApplet">
+    <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
+    <proguard>
+      -libraryjars "${java.home}/lib/rt.jar";lib/JmolApplet.jar
       -injars      in.jar
       -outjars     jalviewApplet.jar
       -keep public class jalview.bin.JalviewLite
        { public * ; }
     </proguard>
-               <delete file="in.jar"/>
-       </target>
+    <delete file="in.jar"/>
+  </target>
 
        <target name="castorbinding" depends="init" description="Generate Java bindings to supported Jalview XML models.">
                <taskdef name="castor-srcgen"