morgand 2003/02/06 09:06:58 Modified: latka build.xml Log: added missing dependency on new jelly junit jar Revision Changes Path 1.39 +157 -185 jakarta-commons/latka/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons/latka/build.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- build.xml 14 Jan 2003 17:37:55 -0000 1.38 +++ build.xml 6 Feb 2003 17:06:58 -0000 1.39 @@ -1,234 +1,206 @@ <?xml version="1.0" encoding="UTF-8"?> <project default="jar" name="commons-latka" basedir="."> - - <property name="defaulttargetdir" value="target"></property> - <property name="classesdir" value="target/classes"></property> - <property name="testclassesdir" value="target/test-classes"></property> - <property name="testreportdir" value="target/test-reports"></property> - - - - - - - - - <property name="resourcedir" value="c:\cvsrep\jakarta-commons\latka/src/resources"></property> - - <property name="distdir" value="dist"></property> - <property name="javadocdir" value="target/docs/apidocs"></property> - <property name="final.name" value="commons-latka-1.0-dev"></property> - + <property name="defaulttargetdir" value="target"> + </property> + <property name="libdir" value="target/lib"> + </property> + <property name="classesdir" value="target/classes"> + </property> + <property name="testclassesdir" value="target/test-classes"> + </property> + <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-latka-1.0-dev"> + </property> <target name="init" description="o Initializes some properties"> - <mkdir dir="lib"></mkdir> + <mkdir dir="${libdir}"> + </mkdir> <condition property="noget"> - <equals arg2="only" arg1="${build.sysclasspath}"></equals> + <equals arg2="only" arg1="${build.sysclasspath}"> + </equals> </condition> </target> - <target name="compile" description="o Compile the code" depends="get-deps"> - - <mkdir dir="${classesdir}"></mkdir> - + <mkdir dir="${classesdir}"> + </mkdir> <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> <src> - <pathelement location="src/java"></pathelement> + <pathelement location="src/java"> + </pathelement> </src> <classpath> - <fileset dir="lib"> - <include name="*.jar"></include> + <fileset dir="${libdir}"> + <include name="*.jar"> + </include> </fileset> </classpath> </javac> - - - - <copy todir="${classesdir}"> - - - - <fileset dir="src/resources"> - - - <include name="**/*latka*"></include> - - <include name="*.properties"></include> - - + <include name="**/*latka*"> + </include> + <include name="*.properties"> + </include> </fileset> </copy> - - - - - - <copy todir="${testclassesdir}"> - - - - <fileset dir="src/test"> - - - <include name="**/*.jelly"></include> - - + <include name="**/*.jelly"> + </include> </fileset> </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> - + <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> + </jar> </target> - <target name="clean" description="o Clean up the generated directories"> - <delete dir="${defaulttargetdir}"></delete> - <delete dir="${distdir}"></delete> + <delete dir="${defaulttargetdir}"> + </delete> + <delete dir="${distdir}"> + </delete> </target> - <target name="dist" description="o Create a distribution" depends="jar, javadoc"> - <mkdir dir="dist"></mkdir> + <mkdir dir="dist"> + </mkdir> <copy todir="dist"> - <fileset dir="${defaulttargetdir}"></fileset> + <fileset dir="${defaulttargetdir}" includes="*.jar"> + </fileset> + <fileset dir="${basedir}" includes="LICENSE*, README*"> + </fileset> </copy> </target> - <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test"> - <fail message="There were test failures."></fail> + <fail message="There were test failures."> + </fail> </target> <target name="internal-test" depends="compile-tests"> - - <mkdir dir="${testreportdir}"></mkdir> - <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true"> - - <sysproperty key="basedir" value="."></sysproperty> - <formatter type="xml"></formatter> - <formatter usefile="false" type="plain"></formatter> - <classpath> - <fileset dir="lib"> - <include name="*.jar"></include> - </fileset> - <pathelement path="${testclassesdir}"></pathelement> - <pathelement path="${classesdir}"></pathelement> - </classpath> - <batchtest todir="${testreportdir}"> - <fileset dir="src/test"> - - <include name="**/Test*.java"></include> - - - <exclude name="**/TestAll.java"></exclude> - - - - - </fileset> - </batchtest> - </junit> - + <mkdir dir="${testreportdir}"> + </mkdir> + <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true"> + <sysproperty key="basedir" value="."> + </sysproperty> + <formatter type="xml"> + </formatter> + <formatter usefile="false" type="plain"> + </formatter> + <classpath> + <fileset dir="${libdir}"> + <include name="*.jar"> + </include> + </fileset> + <pathelement path="${testclassesdir}"> + </pathelement> + <pathelement path="${classesdir}"> + </pathelement> + </classpath> + <batchtest todir="${testreportdir}"> + <fileset dir="src/test"> + <include name="**/Test*.java"> + </include> + <exclude name="**/TestAll.java"> + </exclude> + </fileset> + </batchtest> + </junit> </target> - <target name="compile-tests" depends="compile"> - - <mkdir dir="${testclassesdir}"></mkdir> - <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> - <src> - <pathelement location="src/test"></pathelement> - </src> - <classpath> - <fileset dir="lib"> - <include name="*.jar"></include> - </fileset> - <pathelement path="${classesdir}"></pathelement> - </classpath> - </javac> - - - - - + <mkdir dir="${testclassesdir}"> + </mkdir> + <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> + <src> + <pathelement location="src/test"> + </pathelement> + </src> + <classpath> + <fileset dir="${libdir}"> + <include name="*.jar"> + </include> + </fileset> + <pathelement path="${classesdir}"> + </pathelement> + </classpath> + </javac> </target> - <target name="javadoc" description="o Generate javadoc" depends="jar"> - - - <mkdir dir="${javadocdir}"></mkdir> - - + <mkdir dir="${javadocdir}"> + </mkdir> <tstamp> - <format pattern="2002-yyyy" property="year"></format> + <format pattern="2002-yyyy" property="year"> + </format> </tstamp> - - <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."></property> - - <property name="title" value="Latka 1.0-dev API"></property> - + <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."> + </property> + <property name="title" value="Latka 1.0-dev API"> + </property> <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.latka.*"> <classpath> - <fileset dir="lib"> - <include name="*.jar"></include> + <fileset dir="${libdir}"> + <include name="*.jar"> + </include> </fileset> - <pathelement location="target/${final.name}.jar"></pathelement> + <pathelement location="target/${final.name}.jar"> + </pathelement> </classpath> </javadoc> - </target> - <target name="get-deps" unless="noget" depends="init"> - - - <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get> - <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"></get> - <get dest="lib/commons-httpclient-2.0alpha1-20020829.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0alpha1-20020829.jar"></get> - <get dest="lib/commons-jelly-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-SNAPSHOT.jar"></get> - <get dest="lib/commons-logging-1.0.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.1.jar"></get> - <get dest="lib/jaxen-1.0-FCS-full.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jaxen/jars/jaxen-1.0-FCS-full.jar"></get> - <get dest="lib/jdom-b7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdom/jars/jdom-b7.jar"></get> - <get dest="lib/dom4j-1.4-dev-7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.4-dev-7.jar"></get> - <get dest="lib/junit-3.8.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.jar"></get> - <get dest="lib/log4j-1.2.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/log4j/jars/log4j-1.2.4.jar"></get> - <get dest="lib/regexp-1.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/regexp/jars/regexp-1.2.jar"></get> - <get dest="lib/saxpath-1.0-FCS.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/saxpath/jars/saxpath-1.0-FCS.jar"></get> - <get dest="lib/servletapi-2.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.2.jar"></get> - <get dest="lib/xalan-2.3.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xalan/jars/xalan-2.3.1.jar"></get> - <get dest="lib/xerces-2.0.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.0.0.jar"></get> - <get dest="lib/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> - <get dest="lib/commons-collections-2.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.0.jar"></get> - <get dest="lib/commons-beanutils-1.4.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.4.1.jar"></get> - <get dest="lib/commons-jexl-1.0-beta-1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-1.0-beta-1.jar"></get> - - <get dest="lib/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="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get> - <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"></get> - </target> - - - - - - - - - - + <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.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> + <get dest="${libdir}/commons-httpclient-2.0alpha1-20020829.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0alpha1-20020829.jar"> + </get> + <get dest="${libdir}/commons-jelly-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-SNAPSHOT.jar"> + </get> + <get dest="${libdir}/commons-jelly-tags-junit-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-junit-SNAPSHOT.jar"> + </get> + <get dest="${libdir}/commons-logging-1.0.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.1.jar"> + </get> + <get dest="${libdir}/jaxen-1.0-FCS-full.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jaxen/jars/jaxen-1.0-FCS-full.jar"> + </get> + <get dest="${libdir}/jdom-b7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdom/jars/jdom-b7.jar"> + </get> + <get dest="${libdir}/dom4j-1.4-dev-7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.4-dev-7.jar"> + </get> + <get dest="${libdir}/junit-3.8.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.jar"> + </get> + <get dest="${libdir}/log4j-1.2.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/log4j/jars/log4j-1.2.4.jar"> + </get> + <get dest="${libdir}/regexp-1.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/regexp/jars/regexp-1.2.jar"> + </get> + <get dest="${libdir}/saxpath-1.0-FCS.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/saxpath/jars/saxpath-1.0-FCS.jar"> + </get> + <get dest="${libdir}/servletapi-2.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.2.jar"> + </get> + <get dest="${libdir}/xalan-2.3.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xalan/jars/xalan-2.3.1.jar"> + </get> + <get dest="${libdir}/xerces-2.0.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.0.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> + <get dest="${libdir}/commons-collections-2.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.0.jar"> + </get> + <get dest="${libdir}/commons-beanutils-1.4.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.4.1.jar"> + </get> + <get dest="${libdir}/commons-jexl-1.0-beta-1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-1.0-beta-1.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> + <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> + </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> - - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar> - - </target> - -</project> - \ No newline at end of file + <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"> + </get> + <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> + </unjar> + </target> +</project> \ No newline at end of file
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]