generate vamsas-client-j1.5.jar artefact

git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@520 be28352e-c001-0410-b1a7-c7978e42abec

diff --git a/build.xml b/build.xml
index b3d0a83..ac19664 100644 (file)
--- 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="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" />
                <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="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="**/*" />
                        <fileset dir="${outputDir}">
                                <exclude name="cache*/**" />
                                <include name="**/*" />

@@ -153,7 +160,7 @@ inheritRefs="true"/> -->
                                <exclude name="commons-logging.properties" />
                        </fileset>
                </jar>
                                <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>
                        <fileset dir="docs/api">
                                <include name="**/*" />
                        </fileset>

@@ -164,7 +171,7 @@ inheritRefs="true"/> -->
                                <include name="COPYING*" />
                        </fileset>
                </jar>
                                <include name="COPYING*" />
                        </fileset>
                </jar>

-               <jar destfile="${packageDir}/${vamsasSchemaDocs.jar}">
+               <jar destfile="${packageDir}/${vamsasSchemaDocs.jar}.jar">

                        <fileset dir="${basedir}/schemas">
                                <include name="*.xsd" />
                        </fileset>
                        <fileset dir="${basedir}/schemas">
                                <include name="*.xsd" />
                        </fileset>

@@ -175,7 +182,7 @@ inheritRefs="true"/> -->
                                <include name="COPYING*" />
                        </fileset>
                </jar>
                                <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" />
                        <fileset dir="${basedir}">
                                <include name="src/**/*.java" />
                                <include name="src/**/*.cdr" />