ebourg 2004/09/03 08:49:21 Modified: configuration build.xml Log: Removed absolute paths Revision Changes Path 1.8 +48 -81 jakarta-commons/configuration/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons/configuration/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- build.xml 20 Jul 2004 11:08:36 -0000 1.7 +++ build.xml 3 Sep 2004 15:49:21 -0000 1.8 @@ -1,27 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--build.xml generated by maven from project.xml version 1.0-rc1 - on date July 20 2004, time 1306--> +<!--build.xml generated by maven from project.xml version 1.0-SNAPSHOT + on date September 3 2004, time 1745--> <project default="jar" name="commons-configuration" basedir="."> - <property name="defaulttargetdir" value="D:\dev\apache\jakarta-commons\configuration/target"> + <property name="defaulttargetdir" value="target"> </property> - <property name="libdir" value="D:\dev\apache\jakarta-commons\configuration/target/lib"> + <property name="libdir" value="target/lib"> </property> - <property name="classesdir" value="D:\dev\apache\jakarta-commons\configuration/target/classes"> + <property name="classesdir" value="target/classes"> </property> - <property name="testclassesdir" value="D:\dev\apache\jakarta-commons\configuration/target/test-classes"> + <property name="testclassesdir" value="target/test-classes"> </property> - <property name="testclassesdir" value="D:\dev\apache\jakarta-commons\configuration/target/test-classes"> + <property name="testclassesdir" value="target/test-classes"> </property> - <property name="testreportdir" value="D:\dev\apache\jakarta-commons\configuration/target/test-reports"> + <property name="testreportdir" value="target/test-reports"> </property> <property name="distdir" value="dist"> </property> <property name="javadocdir" value="dist/docs/api"> </property> - <property name="final.name" value="commons-configuration-1.0-rc1"> + <property name="final.name" value="commons-configuration-1.0-SNAPSHOT"> </property> + <path id="build.classpath"> + <fileset dir="${libdir}"> + <include name="**/*.jar"> + </include> + </fileset> + </path> <target name="init" description="o Initializes some properties"> <mkdir dir="${libdir}"> </mkdir> @@ -29,6 +35,10 @@ <equals arg2="only" arg1="${build.sysclasspath}"> </equals> </condition> + <!--Test if JUNIT is present in ANT classpath--> + + <available property="Junit.present" classname="junit.framework.Test"> + </available> </target> <target name="compile" description="o Compile the code" depends="get-deps"> <mkdir dir="${classesdir}"> @@ -38,11 +48,7 @@ <pathelement location="src/java"> </pathelement> </src> - <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> + <classpath refid="build.classpath"> </classpath> </javac> <copy todir="${classesdir}"> @@ -51,40 +57,6 @@ </include> </fileset> </copy> - <copy todir="${testclassesdir}"> - <fileset dir="conf"> - <include name="*.xml"> - </include> - </fileset> - </copy> - <copy todir="${testclassesdir}"> - <fileset dir="conf"> - <include name="testClasspath.properties"> - </include> - <include name="testdb.script"> - </include> - <include name="*.properties"> - </include> - </fileset> - </copy> - <mkdir dir="${testclassesdir}/org/apache/commons/configuration"> - </mkdir> - <copy todir="${testclassesdir}/org/apache/commons/configuration"> - <fileset dir="conf"> - <include name="test.properties"> - </include> - <include name="include.properties"> - </include> - </fileset> - </copy> - <mkdir dir="${testclassesdir}/config"> - </mkdir> - <copy todir="${testclassesdir}/config"> - <fileset dir="conf/config"> - <include name="**/*.properties"> - </include> - </fileset> - </copy> </target> <target name="jar" description="o Create the jar" depends="compile,test"> <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> @@ -110,7 +82,7 @@ <fail message="There were test failures."> </fail> </target> - <target name="internal-test" depends="compile-tests"> + <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"> <mkdir dir="${testreportdir}"> </mkdir> <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true"> @@ -121,10 +93,8 @@ <formatter usefile="false" type="plain"> </formatter> <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> + <path refid="build.classpath"> + </path> <pathelement path="${testclassesdir}"> </pathelement> <pathelement path="${classesdir}"> @@ -142,7 +112,12 @@ </batchtest> </junit> </target> - <target name="compile-tests" depends="compile"> + <target name="junit-present" unless="Junit.present" depends="init"> + <echo>================================= WARNING ================================</echo> + <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo> + <echo>==========================================================================</echo> + </target> + <target name="compile-tests" if="Junit.present" depends="junit-present,compile"> <mkdir dir="${testclassesdir}"> </mkdir> <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> @@ -151,22 +126,20 @@ </pathelement> </src> <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> + <path refid="build.classpath"> + </path> <pathelement path="${classesdir}"> </pathelement> </classpath> </javac> <copy todir="${testclassesdir}"> - <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test"> + <fileset dir="src/test"> <include name="*.xml"> </include> </fileset> </copy> <copy todir="${testclassesdir}"> - <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test"> + <fileset dir="src/test"> <include name="testClasspath.properties"> </include> <include name="testdb.script"> @@ -178,7 +151,7 @@ <mkdir dir="${testclassesdir}/org/apache/commons/configuration"> </mkdir> <copy todir="${testclassesdir}/org/apache/commons/configuration"> - <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test"> + <fileset dir="src/test"> <include name="test.properties"> </include> <include name="include.properties"> @@ -188,13 +161,13 @@ <mkdir dir="${testclassesdir}/config"> </mkdir> <copy todir="${testclassesdir}/config"> - <fileset dir="D:\dev\apache\jakarta-commons\configuration\src\test"> + <fileset dir="src/test"> <include name="**/*.properties"> </include> </fileset> </copy> </target> - <target name="javadoc" description="o Generate javadoc"> + <target name="javadoc" description="o Generate javadoc" depends="get-deps"> <mkdir dir="${javadocdir}"> </mkdir> <tstamp> @@ -203,31 +176,31 @@ </tstamp> <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved."> </property> - <property name="title" value="Commons Configuration 1.0-rc1 API"> + <property name="title" value="Commons Configuration 1.0-SNAPSHOT API"> </property> <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.configuration.*"> <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> - <pathelement location="${defaulttargetdir}/${final.name}.jar"> - </pathelement> + <path refid="build.classpath"> + </path> </classpath> </javadoc> </target> <target name="get-deps" unless="noget" depends="init"> + <!--Proxy settings works only with a JDK 1.2 and higher.--> + + <setproxy proxyuser="ebourg" proxyport="8080" proxypassword="tl/2cm1x" proxyhost="172.16.0.82"> + </setproxy> <get dest="${libdir}/commons-collections-3.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-3.0.jar"> </get> <get dest="${libdir}/commons-lang-2.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-2.0.jar"> </get> - <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar"> - </get> <get dest="${libdir}/dom4j-1.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.4.jar"> </get> + <get dest="${libdir}/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.4.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> - <get dest="${libdir}/commons-beanutils-1.7-dev.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.7-dev.jar"> + <get dest="${libdir}/commons-beanutils-1.7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.7.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> @@ -245,15 +218,9 @@ </get> <get dest="${libdir}/junit-addons-1.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit-addons/jars/junit-addons-1.4.jar"> </get> - <get dest="${libdir}/maven-tasks-plugin-1.1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven/plugins/maven-tasks-plugin-1.1.0.jar"> - </get> - <get dest="${libdir}/maven-findbugs-plugin-0.7.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven/plugins/maven-findbugs-plugin-0.7.2.jar"> - </get> - <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"> - </get> - <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"> + <get dest="${libdir}/maven-tasks-plugin-1.1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven-plugins/plugins/maven-tasks-plugin-1.1.0.jar"> </get> - <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"> + <get dest="${libdir}/maven-findbugs-plugin-0.8.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven-plugins/plugins/maven-findbugs-plugin-0.8.4.jar"> </get> </target> <target name="install-maven">
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]