rdonkin 2004/10/13 13:24:49 Modified: betwixt build.xml Log: Re-generated ant build (so that latest dependencies are reflected) Revision Changes Path 1.15 +33 -38 jakarta-commons/betwixt/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons/betwixt/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- build.xml 29 Feb 2004 21:58:36 -0000 1.14 +++ build.xml 13 Oct 2004 20:24:49 -0000 1.15 @@ -1,41 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2001-2004 The Apache Software Foundation - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - build.xml generated by maven from project.xml version 1.0-beta-1-dev - on date November 24 2003, time 2047 ---> +<!--build.xml generated by maven from project.xml version 0.6.1-dev + on date October 13 2004, time 2122--> <project default="jar" name="commons-betwixt" basedir="."> - <property name="defaulttargetdir" value="target"> + <property name="defaulttargetdir" value="/Volumes/gSpecials/library/jakarta/jakarta-commons/betwixt/target"> + </property> + <property name="libdir" value="/Volumes/gSpecials/library/jakarta/jakarta-commons/betwixt/target/lib"> </property> - <property name="libdir" value="target/lib"> + <property name="classesdir" value="/Volumes/gSpecials/library/jakarta/jakarta-commons/betwixt/target/classes"> </property> - <property name="classesdir" value="target/classes"> + <property name="testclassesdir" value="/Volumes/gSpecials/library/jakarta/jakarta-commons/betwixt/target/test-classes"> </property> - <property name="testclassesdir" value="target/test-classes"> + <property name="testclassesdir" value="/Volumes/gSpecials/library/jakarta/jakarta-commons/betwixt/target/test-classes"> </property> - <property name="testreportdir" value="target/test-reports"> + <property name="testreportdir" value="/Volumes/gSpecials/library/jakarta/jakarta-commons/betwixt/target/test-reports"> </property> <property name="distdir" value="dist"> </property> <property name="javadocdir" value="dist/docs/api"> </property> - <property name="final.name" value="commons-betwixt-1.0-beta-1-dev"> + <property name="final.name" value="commons-betwixt-0.6.1-dev"> </property> <target name="init" description="o Initializes some properties"> <mkdir dir="${libdir}"> @@ -60,6 +45,12 @@ </fileset> </classpath> </javac> + <copy todir="${classesdir}"> + <fileset dir="src/java"> + <include name="**/*.betwixt"> + </include> + </fileset> + </copy> <copy todir="${testclassesdir}"> <fileset dir="src/test"> <include name="**/*.betwixt"> @@ -68,7 +59,7 @@ </copy> </target> <target name="jar" description="o Create the jar" depends="compile,test"> - <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> + <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> </jar> </target> <target name="clean" description="o Clean up the generated directories"> @@ -83,7 +74,7 @@ <copy todir="dist"> <fileset dir="${defaulttargetdir}" includes="*.jar"> </fileset> - <fileset dir="${basedir}" includes="LICENSE*, NOTICE*, README*"> + <fileset dir="${basedir}" includes="LICENSE*, README*"> </fileset> </copy> </target> @@ -136,25 +127,31 @@ </pathelement> </classpath> </javac> + <copy todir="${testclassesdir}"> + <fileset dir="/Volumes/gSpecials/library/jakarta/jakarta-commons/betwixt/src/test"> + <include name="**/*.betwixt"> + </include> + </fileset> + </copy> </target> - <target name="javadoc" description="o Generate javadoc" depends="jar"> + <target name="javadoc" description="o Generate javadoc"> <mkdir dir="${javadocdir}"> </mkdir> <tstamp> <format pattern="2002-yyyy" property="year"> </format> </tstamp> - <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."> + <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved."> </property> - <property name="title" value="Betwixt 1.0-beta-1-dev API"> + <property name="title" value="Betwixt 0.6.1-dev API"> </property> - <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.*.*"> + <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.betwixt.*"> <classpath> <fileset dir="${libdir}"> <include name="*.jar"> </include> </fileset> - <pathelement location="target/${final.name}.jar"> + <pathelement location="${defaulttargetdir}/${final.name}.jar"> </pathelement> </classpath> </javadoc> @@ -162,13 +159,11 @@ <target name="get-deps" unless="noget" depends="init"> <get dest="${libdir}/commons-logging-1.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.2.jar";> </get> - <get dest="${libdir}/commons-beanutils-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.6.1.jar";> - </get> - <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar";> + <get dest="${libdir}/commons-beanutils-core-1.7.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-core-1.7.0.jar";> </get> - <get dest="${libdir}/commons-digester-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.5.jar";> + <get dest="${libdir}/commons-digester-1.6.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.6.jar";> </get> - <get dest="${libdir}/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.2.1.jar";> + <get dest="${libdir}/xerces-2.4.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.4.0.jar";> </get> <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar";> </get> @@ -182,7 +177,7 @@ </get> </target> <target name="install-maven"> - <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"> + <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"> </get> <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> </unjar>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
