From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 7 May 2007 14:12:13 +0000 (+0000)
Subject: Can compile and obfuscate applet with Jmol
X-Git-Tag: Release_2_3~44
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c37851e9df086bcec69f32cf5067024e4dcdb01d;p=jalview.git

Can compile and obfuscate applet with Jmol
---

diff --git a/build.xml b/build.xml
index a20a2aa..d9253b0 100755
--- a/build.xml
+++ b/build.xml
@@ -337,59 +337,50 @@
 
 
 
-	<!-- Compile, package and obfuscate Jalview Applet -->
-	<target name="makeApplet" depends="obfuscate"/>
-	
-	<target name="compileApplet" depends="init,clean">
-		<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}" 
+  <!-- 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}" 
     destdir="${outputDir}"
+    classpath="lib/JmolApplet.jar"
        includes="jalview/appletgui/**"
        excludes="ext/**,MCview/**,org/**,vamsas/**"
-       classpathref="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>
-			<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"