X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=e51b3b36392f8f9a0a15579ee82c12f5fb677568;hb=2adef1fc6380e02a153d373fed9e1e06089d83db;hp=d9253b0f37d1acef1f0b613810058610cee6b84a;hpb=c37851e9df086bcec69f32cf5067024e4dcdb01d;p=jalview.git

diff --git a/build.xml b/build.xml
index d9253b0..e51b3b3 100755
--- a/build.xml
+++ b/build.xml
@@ -54,7 +54,9 @@
 			</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="DEVELOPMENT"/> <!-- 2.4 (VAMSAS)" -->
+		<!-- Include debugging information in javac true or false -->
+		<property name="javac.debug" value="true"/>
 		<!-- 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 +70,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" />
@@ -89,12 +93,16 @@
 		</path>
 		<!-- The Location of the java 1.1.8 jdk -->
 		<property name="java118.home" value="C:\Sun\jdk1.1.8" />
+		<property name="applet.jre.tools" value="${java118.home}/lib/classes.zip"/>
+		<!-- jre for 1.4 version
+		<property name="applet.jre.tools" value="${java.home}/lib/rt.jar"/>
+		-->
 		<!-- 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"/>
+	   	<pathelement location="lib/${jmolJar}"/>
 	  </path>
 	</target>
 
@@ -156,6 +164,7 @@
 		<javac source="1.4" target="1.4"
         srcdir ="${sourceDir}"
         destdir="${outputDir}"
+				debug="${javac.debug}"
       classpathref="build.classpath">
 			<exclude name="jalview/*applet*"/>
 			<exclude name="com/stevesoft/**"/>
@@ -346,7 +355,7 @@
     target="1.1"
     srcdir="${sourceDir}" 
     destdir="${outputDir}"
-    classpath="lib/JmolApplet.jar"
+    classpath="lib/${jmolJar}"
        includes="jalview/appletgui/**"
        excludes="ext/**,MCview/**,org/**,vamsas/**"
        />
@@ -371,47 +380,97 @@
   </target>
 
   <target name="obfuscate" depends="packageApplet">
+    <path id="obfuscateDeps.path">
+    <pathelement location="${applet.jre.tools}"/>
+    <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>
 
 	<target name="castorbinding" depends="init" description="Generate Java bindings to supported Jalview XML models.">
 		<taskdef name="castor-srcgen"
-				  classname="org.exolab.castor.tools.ant.taskdefs.CastorSourceGenTask"
-			      classpathref="build.classpath" />
+			  classname="org.castor.anttask.CastorCodeGenTask"
+		      classpathref="build.classpath" />
 		<delete>
-			<fileset dir="${sourceDir}/jalview/schemabinding/version2/">
-				<filename name="*"/>
+			<fileset dir="${sourceDir}/jalview/schemabinding/version2">
+				<include name="*.java"/>
+				<include name="descriptors/*.java"/>
 			</fileset>
 		</delete>
 		<castor-srcgen file="${schemaDir}/vamsas.xsd"
 			      todir="${sourceDir}"
 			      package="jalview.schemabinding.version2"
-			      warnings="true" 
+			      warnings="false" 
 				  	nodesc="false"
+						verbose="true"
 						properties="${schemaDir}/jalview.properties"
 		/>
 		<castor-srcgen file="${schemaDir}/JalviewUserColours.xsd"
 			      todir="${sourceDir}"
 			      package="jalview.schemabinding.version2"
-			      warnings="true" 
+			      warnings="false" 
 				  	nodesc="false"
+						verbose="true"
 						properties="${schemaDir}/jalview.properties"
 		/>
 		<castor-srcgen file="${schemaDir}/jalview.xsd"
 			      todir="${sourceDir}"
 			      package="jalview.schemabinding.version2"
-			      warnings="true" 
+			      warnings="false" 
 					  nodesc="false"
+						verbose="true"
 						properties="${schemaDir}/jalview.properties"
 			
+		/>
+		<!-- 
+		now build the jalview.binding package with the old schema set
+		-->
+		<delete>
+			<fileset dir="${sourceDir}/jalview/binding/">
+				<include name="**"/>
+			</fileset>
+		</delete>
+		<castor-srcgen file="${schemaDir}/vamsasJvV1.xsd"
+			      todir="${sourceDir}"
+			      package="jalview.binding"
+			      warnings="false" 
+				  	nodesc="true"
+						verbose="true"
+						properties="${schemaDir}/jalview.nodesc.properties"
+		/> 
+		<castor-srcgen file="${schemaDir}/JalviewUserColours.xsd"
+			      todir="${sourceDir}"
+			      package="jalview.binding"
+			      warnings="false" 
+				  	nodesc="true"
+						verbose="true"
+						properties="${schemaDir}/jalview.nodesc.properties"
+		/>
+		<castor-srcgen file="${schemaDir}/jalviewJvV1.xsd"
+			      todir="${sourceDir}"
+			      package="jalview.binding"
+			      warnings="false" 
+					  nodesc="true"
+						verbose="true"
+						properties="${schemaDir}/jalview.nodesc.properties"
 	/>
 	</target>
 </project>