From 39c5a2d4f29ba298876518c808d0738f90f3926c Mon Sep 17 00:00:00 2001
From: jprocter <Jim Procter>
Date: Wed, 18 Apr 2007 10:55:22 +0000
Subject: [PATCH] made compileApplet and obfuscate depend on the presence of a
 java 1.1 jdk to ensure that applet jar is properly 1.1
 compliant.

---
 build.xml |   38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index b415140..a20a2aa 100755
--- 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>
 
 
@@ -329,18 +339,26 @@
 
 	<!-- Compile, package and obfuscate Jalview Applet -->
 	<target name="makeApplet" depends="obfuscate"/>
-
+	
 	<target name="compileApplet" depends="init,clean">
-		<mkdir dir="${outputDir}"/>
-    <javac source="1.2"
-    target="1.1"
-    srcdir="${sourceDir}" 
+		<echo>
+		Using jdk from java118.home = ${java118.home}
+		</echo>
+			<mkdir dir="${outputDir}"/>
+    <property name="build.sysclasspath" value="ignore"/>
+    <property name="build.compiler" value="classic"/>
+		<javac 
+  		fork="true"
+		  	includeAntRuntime="no"
+		  	includeJavaRuntime="no"
+				target="1.1"
+  		source="1.1"
+		srcdir="${sourceDir}" 
     destdir="${outputDir}"
-    classpath="lib/jmol.jar"
        includes="jalview/appletgui/**"
        excludes="ext/**,MCview/**,org/**,vamsas/**"
-       
-       />
+       classpathref="jalviewlite.deps"
+    />
 	</target>
 
 	<target name="packageApplet" depends="compileApplet, buildPropertiesFile">
@@ -363,10 +381,6 @@
 
 	<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"/>
       -injars      in.jar
-- 
1.7.10.2