X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=19ec5f2a2eead6a56bebcd21f2f8c8207247d2ee;hb=7511792d44f06e239b56010abd2e8b3480835e39;hp=a20a2aa9ceb7423d76c2a883aeac6dc718ccadd7;hpb=39c5a2d4f29ba298876518c808d0738f90f3926c;p=jalview.git

diff --git a/build.xml b/build.xml
index a20a2aa..19ec5f2 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,12 @@
 		<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" />
+		<property name="jalviewLiteJar" value="jalviewApplet.jar"/>
+		<!-- switch to indicate if we should obfuscate jalviewLite -->
+		<!--<property name="donotobfuscate" value="true"/> -->
+				
 		<!-- 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" />
@@ -86,15 +94,21 @@
 				<include name="*.jar"/>
 				<include name="**/*.jar"/>
 			</fileset>
+			
 		</path>
+		<property name="source.dist.name" value="${basedir}/jalview-src.tar.gz"/>
 		<!-- 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 +170,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/**"/>
@@ -191,7 +206,8 @@
 		<taskdef classpathref="build.classpath" resource="com/roxes/tools/ant/taskdefs.properties"/>
 
 		<!--    codebase="http://www.jalview.org/jalview/webstart" -->
-		<jnlp toFile="${packageDir}/jalview.jnlp" href="jalview.jnlp"
+		<!-- href="jalview.jnlp" prevent hard-wired pickup of jnlp in certain javaws versions -->
+		<jnlp toFile="${packageDir}/jalview.jnlp" 
       codebase="${WebStartLocation}">
 			<information>
 				<title>Jalview</title>
@@ -210,6 +226,7 @@
         <association mime-type="application-x/ext-file" extensions="pfam"/>
         <association mime-type="application-x/ext-file" extensions="aln"/>
         <association mime-type="application-x/ext-file" extensions="pir"/>
+        <association mime-type="application-x/ext-file" extensions="amsa"/>
 	-->
 			</information>
 			<resources>
@@ -337,90 +354,160 @@
 
 
 
-	<!-- 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}"
+   	debug="${javac.debug}"
+    classpath="lib/${jmolJar}"
        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="-obfuscatefake,-obfuscatereally" description="construct the final jalviewLite applet jar with or without obfuscation">
+  </target>
+	<target name="-obfuscatefake" depends="packageApplet" if="donotobfuscate">    
+  	<copy file="in.jar" tofile="${jalviewLiteJar}" />    	
+    <delete file="in.jar"/>
+  </target>
+	<target name="-obfuscatereally" unless="donotobfuscate">
+    
+  	<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>
+      <injar file="in.jar"/>
+      <outjar file="${jalviewLiteJar}"/>
+      <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>
+       { 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>
+	<target name="sourcedist" description="create jalview source distribution" depends="init">
+		<delete file="${source.dist.name}"/>
+		<tar destfile="${source.dist.name}" compression="gzip">
+			<tarfileset dir="./" prefix="jalview" preserveLeadingSlashes="true">
+				<include name="LICENSE"/>
+				<include name="README"/>
+				<include name="build.xml"/>
+				<include name="jalview-jalopy.xml"/>
+				<include name="JalviewApplet.jpx"/>
+				<include name="JalviewX.jpx"/>
+				<include name="${sourceDir}/*.java"/>
+				<include name="${sourceDir}/**/*.java"/>
+				<include name="${sourceDir}/**/*.cdr"/>
+				<include name="${libDir}/**/*"/>						
+				<include name="${resourceDir}/**/*"/>						
+				<include name="${helpDir}/**/*"/>						
+				<include name="utils/**/*"/>						
+				<include name="${schemaDir}/**/*"/>						
+				<include name="${docDir}/**/*"/>						
+			</tarfileset>
+		</tar>
+	</target>
 </project>