X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=d44bc0a13c93154e2440d711f5f5ac1bb50594c4;hb=69cfd66548e4aec0de74b70b81ccd83c5b38de47;hp=51aeaff52571559f69f2169072b66afc7e611d34;hpb=c3728a867568a9d81aa56e89ec1f7439fce846b5;p=vamsas.git

diff --git a/build.xml b/build.xml
index 51aeaff..d44bc0a 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,9 @@
 		<property name="sourceDir" value="src" />
 		<property name="outputDir" value="classes" />
 		<property name="packageDir" value="packages" />
-		<property name="vamsas.schema" value="schemas/vamsas15_9.xsd" />
+		<property name="vamsasClient.jar" value="vamsas-client.jar" />
+		<property name="vamsas.schema" value="schemas/vamsas.xsd" />
+		<property name="vamsas.doc.schema" value="schemas/vamsasDocument.xsd" />
 		<property name="vamsas.schema.package" value="org.vamsas.objects.core" />
 		<property name="vamsas.schema.package.src" value="org/vamsas/objects/core" />
 		<property name="vamsas.schema.sourcegen.properties" value="schemas/castorbuilder.properties"/>
@@ -50,13 +52,21 @@
 	<taskdef name="castor-srcgen"
 		  classname="org.exolab.castor.tools.ant.taskdefs.CastorSourceGenTask"
 	      classpathref="castor.classpath" />
-	<castor-srcgen file="${vamsas.schema}"
+	<!-- Should apply this to every schema file in ${vamsas.schemas} directory -->
+		<castor-srcgen file="${vamsas.schema}"
 	      todir="${sourceDir}"
 	      package="${vamsas.schema.package}"
 	      warnings="false" 
 		  nodesc="false"
 		properties="${vamsas.schema.sourcegen.properties}"
 	/>	
+		<castor-srcgen file="${vamsas.doc.schema}"
+			      todir="${sourceDir}"
+			      package="${vamsas.schema.package}"
+			      warnings="false" 
+				  nodesc="false"
+				properties="${vamsas.schema.sourcegen.properties}"
+			/>	
 	</target>
 	<target name="prepare" depends="init">
 		<mkdir dir="${packageDir}"/>
@@ -99,9 +109,29 @@ inheritRefs="true"/> -->
 
 	<target name="build" depends="init, prepare">
 		<!-- not efficient yet. : use excludes="*/localtest/*.java" if local tests are not building -->
-		<javac classpathref="build.classpath" debug="on" srcdir="${sourceDir}" destdir="${outputDir}" />
+		<javac classpathref="build.classpath" debug="on" srcdir="${sourceDir}" destdir="${outputDir}" deprecation="on" >
+	<exclude name="uk/ac/ebi/msd/vamsas/**"/>
+		</javac>
 	</target>
-
+	<target name="jar" depends="build">
+		<jar destfile="${packageDir}/${vamsasClient.jar}">
+		<fileset dir="${outputDir}">
+	          <exclude name="cache*/**"/>
+	          <include name="**/*" />
+	          <exclude name="*.jar.*" />
+	          <exclude name="**/*.jar" />
+	          <exclude name="**/*.jar.*" />
+		</fileset>
+		</jar>
+	</target>
+	
+	<target name="javadoc" depends="init">
+  	<javadoc destdir="docs/api" author="true" version="true" use="true">  	  
+      <fileset dir="${sourceDir}" defaultexcludes="yes">
+      </fileset>
+    </javadoc>
+  </target>
+	
 </project>