X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=ab984bb76799233f87a162c7f7b44b6a28d15960;hb=b52fe49107237189a0a63e7f807db66a30d29d90;hp=303c160dd0921dbcc9cb432be959359752c3a724;hpb=ab3c2e69dc9bd0902a021c2cf6dafc1ddf338b3b;p=vamsas.git

diff --git a/build.xml b/build.xml
index 303c160..ab984bb 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,9 @@
 		<property name="outputDir" value="classes" />
 		<property name="packageDir" value="packages" />
 		<property name="vamsasClient.jar" value="vamsas-client.jar" />
-		<property name="vamsas.schema" value="schemas/vamsas.xsd" />
+		<property name="vamsasClientDoc.jar" value="vamsas-client-docs.jar" />
+		<property name="vamsasClientSource.jar" value="vamsas-client-src-doc.jar" />
+				<property name="vamsas.schema" value="schemas/vamsas.xsd" />
 		<property name="vamsas.doc.schema" value="schemas/vamsasDocument.xsd" />
 		<property name="vamsas.schema.package" value="uk.ac.vamsas.objects.core" />
 		<property name="vamsas.schema.package.src" value="uk/ac/vamsas/objects/core" />
@@ -45,12 +47,13 @@
 		<delete>
 			<fileset dir="${sourceDir}/${vamsas.schema.package.src}">
 				<include name="*.java"/>
+				<include name="descriptors/*.java"/>
 			</fileset>
 		</delete>
 	</target>
 	<target name="makecoresource" depends="init, cleancoresource" description="Generate Java source files from XSD.">
 	<taskdef name="castor-srcgen"
-		  classname="org.exolab.castor.tools.ant.taskdefs.CastorSourceGenTask"
+		  classname="org.castor.anttask.CastorCodeGenTask"
 	      classpathref="castor.classpath" />
 	<!-- Should apply this to every schema file in ${vamsas.schemas} directory -->
 		<castor-srcgen file="${vamsas.schema}"
@@ -73,6 +76,11 @@
 		<mkdir dir="${outputDir}"/>
 		<copy todir="${outputDir}">
 			<fileset dir="${resourceDir}" />
+			<fileset dir="${basedir}">
+				<include name="LICENS*"/>
+				<include name="CONTRIB"/>
+				<include name="README"/>
+			</fileset>
 		</copy>
 	</target>
 	<target name="clean" depends="init">
@@ -123,21 +131,51 @@ inheritRefs="true"/> -->
 	          <exclude name="**/*.jar.*" />
 			  <exclude name="*.java"/>
 			  <exclude name="**/*.java"/>
-			  <exclude name="uk/**"/>
 			  <exclude name="uk/*.class"/>
 			  <exclude name="log4j.properties"/>
 			<exclude name="commons-logging.properties"/>
 		</fileset>
 		</jar>
+		<jar destfile="${packageDir}/${vamsasClientDoc.jar}">
+			<fileset dir="docs/api">
+				<include name="**/*"/>
+				<include name="README"/>
+				<include name="CONTRIB"/>
+				<include name="LICEN*"/>
+			</fileset>
+		</jar>
+		<jar destfile="${packageDir}/${vamsasClientSource.jar}">
+			<fileset dir="${basedir}">
+				<include name="src/**/*.java"/>
+				<include name="src/**/*.cdr"/>
+				<exclude name="*~"/>
+				<exclude name="**/*.java~"/>
+				<include name="resources/**"/>
+				<include name="utils/**"/>
+				<include name="tools/**"/>
+				<include name="schemas/**"/>
+				<include name="test"/>
+				<include name="docs/**"/>
+				<include name="tools/**"/>
+				<include name="lib/**"/>
+				<include name="README"/>
+				<include name="CONTRIB"/>
+				<include name="LICEN*"/>
+				<include name="*.eclipse*"/>
+				<include name="*.launch"/>
+				<include name="build.xml"/>
+			</fileset>
+			</jar>
 	</target>
 	
 	<target name="javadoc" depends="init">
-  	<javadoc destdir="docs/api" author="true" version="true" use="true">  	  
+  	<javadoc destdir="docs/api"  classpathref="build.classpath" author="true" version="true" use="true">  	  
       <fileset dir="${sourceDir}" defaultexcludes="yes">
+      	<exclude name="**/.castor.cdr"/>
+      	<!-- this was for the old ebi packages.
       	<exclude name="uk/**"/>
-      	<exclude name="uk/*.java"/>
-      	<exclude name=".castor.cdr"/>
-      </fileset>
+      	<exclude name="uk/*.java"/> -->
+	    </fileset>
     </javadoc>
   </target>