You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mo...@apache.org on 2003/01/08 18:40:00 UTC
cvs commit: jakarta-commons-sandbox/jelly/jelly-tags/betwixt build.xml
morgand 2003/01/08 09:40:00
Modified: jelly/jelly-tags/betwixt build.xml
Log:
rebuilt ant script with an up-to-date Maven install
Revision Changes Path
1.2 +111 -40 jakarta-commons-sandbox/jelly/jelly-tags/betwixt/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/betwixt/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 3 Jan 2003 21:55:57 -0000 1.1
+++ build.xml 8 Jan 2003 17:39:59 -0000 1.2
@@ -6,12 +6,24 @@
<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="."></property>
+
<property name="distdir" value="dist"></property>
<property name="javadocdir" value="target/docs/apidocs"></property>
- <property name="final.name" value="commons-jelly-tags-betwixt-1.0-beta-1"></property>
+ <property name="final.name" value="commons-jelly-tags-betwixt-1.0-SNAPSHOT"></property>
<target name="init" description="o Initializes some properties">
-
+ <mkdir dir="lib"></mkdir>
<condition property="noget">
<equals arg2="only" arg1="${build.sysclasspath}"></equals>
</condition>
@@ -33,6 +45,54 @@
</javac>
+
+
+ <copy todir="${classesdir}">
+
+
+
+
+ <fileset dir="src/java">
+
+
+ <include name="**/*.properties"></include>
+
+
+ </fileset>
+ </copy>
+
+
+
+
+
+
+ <copy todir="${testclassesdir}">
+
+
+
+
+ <fileset dir="src/test">
+
+
+ <include name="**/*.jelly"></include>
+
+ <include name="**/*.xml"></include>
+
+ <include name="**/*.xsl"></include>
+
+ <include name="**/*.rng"></include>
+
+ <include name="**/*.dtd"></include>
+
+ <include name="**/*.properties"></include>
+
+ <include name="**/*.html"></include>
+
+
+ </fileset>
+ </copy>
+
+
</target>
@@ -54,46 +114,57 @@
</copy>
</target>
- <target name="test" description="o Run the test cases" depends="compile-tests">
- <mkdir dir="${testreportdir}"></mkdir>
- <junit dir="./" printSummary="yes" fork="true" haltonerror="true">
- <sysproperty key="basedir" value="src/test"></sysproperty>
- <formatter type="xml"></formatter>
- <formatter usefile="true" type="plain"></formatter>
- <classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
- </fileset>
- <pathelement location="target/${final.name}.jar"></pathelement>
- <pathelement path="${testclassesdir}"></pathelement>
- </classpath>
- <batchtest todir="${testreportdir}">
- <fileset dir="src/test">
-
- <include name="**/Test*.java"></include>
-
-
- </fileset>
- </batchtest>
- </junit>
+ <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+ <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="true" 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>
+
+
+
+
+
+ </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 location="target/${final.name}.jar"></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="lib">
+ <include name="*.jar"></include>
+ </fileset>
+ <pathelement path="${classesdir}"></pathelement>
+ </classpath>
+ </javac>
+
+
+
</target>
@@ -109,7 +180,7 @@
<property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."></property>
- <property name="title" value="commons-jelly-tags-betwixt 1.0-beta-1 API"></property>
+ <property name="title" value="commons-jelly-tags-betwixt 1.0-SNAPSHOT API"></property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.jelly.tags.betwixt.*">
<classpath>
@@ -124,7 +195,6 @@
<target name="get-deps" unless="noget" depends="init">
- <mkdir dir="lib"></mkdir>
<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/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>
@@ -139,7 +209,8 @@
<get dest="lib/commons-digester-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-SNAPSHOT.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>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>