X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=ac19664aa57cf331fce74603e207cc83ff2c50bd;hb=3ce63182dd6fed777ef6179ad5570ab54a1d7b63;hp=b3d0a836f0770b53b3e3d91d107ad1ea0201e900;hpb=857b743c6d88e9f6575e9c78663c018819cb9cad;p=vamsas.git

diff --git a/build.xml b/build.xml
index b3d0a83..ac19664 100644
--- a/build.xml
+++ b/build.xml
@@ -30,10 +30,11 @@
 		<property name="sourceDir" value="src" />
 		<property name="outputDir" value="classes" />
 		<property name="packageDir" value="packages" />
-		<property name="vamsasClient.jar" value="vamsas-client.jar" />
-		<property name="vamsasClientDoc.jar" value="vamsas-client-docs.jar" />
-		<property name="vamsasClientSource.jar" value="vamsas-client-src-doc.jar" />
-		<property name="vamsasSchemaDocs.jar" value="vamsas-schema-and-doc.jar" />
+		<!-- .jar gets added when the property is used -->
+		<property name="vamsasClient.jar" value="vamsas-client" /> 
+		<property name="vamsasClientDoc.jar" value="vamsas-client-docs" />
+		<property name="vamsasClientSource.jar" value="vamsas-client-src-doc" />
+		<property name="vamsasSchemaDocs.jar" value="vamsas-schema-and-doc" />
 		<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" />
@@ -138,8 +139,14 @@ inheritRefs="true"/> -->
 	<target name="build" depends="build1.4,build1.5">
 		<echo message="Finished building" />
 	</target>
-	<target name="jar" depends="build, javadoc">
-		<jar destfile="${packageDir}/${vamsasClient.jar}">
+	<target name="jartarget1.4" if="target1.4" depends="init">
+		<property name="vamsasClient.jar.real" value="${vamsasClient.jar}"/>
+	</target>
+	<target name="jartarget1.5" unless="target1.4" depends="init">
+			<property name="vamsasClient.jar.real" value="${vamsasClient.jar}-j1.5"/>
+	</target>
+	<target name="jar" depends="build, javadoc,jartarget1.4,jartarget1.5">
+		<jar destfile="${packageDir}/${vamsasClient.jar.real}.jar">
 			<fileset dir="${outputDir}">
 				<exclude name="cache*/**" />
 				<include name="**/*" />
@@ -153,7 +160,7 @@ inheritRefs="true"/> -->
 				<exclude name="commons-logging.properties" />
 			</fileset>
 		</jar>
-		<jar destfile="${packageDir}/${vamsasClientDoc.jar}">
+		<jar destfile="${packageDir}/${vamsasClientDoc.jar}.jar">
 			<fileset dir="docs/api">
 				<include name="**/*" />
 			</fileset>
@@ -164,7 +171,7 @@ inheritRefs="true"/> -->
 				<include name="COPYING*" />
 			</fileset>
 		</jar>
-		<jar destfile="${packageDir}/${vamsasSchemaDocs.jar}">
+		<jar destfile="${packageDir}/${vamsasSchemaDocs.jar}.jar">
 			<fileset dir="${basedir}/schemas">
 				<include name="*.xsd" />
 			</fileset>
@@ -175,7 +182,7 @@ inheritRefs="true"/> -->
 				<include name="COPYING*" />
 			</fileset>
 		</jar>
-		<jar destfile="${packageDir}/${vamsasClientSource.jar}">
+		<jar destfile="${packageDir}/${vamsasClientSource.jar}.jar">
 			<fileset dir="${basedir}">
 				<include name="src/**/*.java" />
 				<include name="src/**/*.cdr" />