jstrachan 2002/11/06 12:49:09
Modified: jelly build.xml
Log:
patched the auto-generated Ant build file so at least it can compile Jelly using
vanilla Ant. The unit tests don't quite run just yet (should get those working real
soon).
Revision Changes Path
1.68 +71 -50 jakarta-commons-sandbox/jelly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/build.xml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- build.xml 22 Oct 2002 13:41:53 -0000 1.67
+++ build.xml 6 Nov 2002 20:49:09 -0000 1.68
@@ -6,12 +6,29 @@
<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:\workspace\jelly/src/java"></property>
+ <property name="testresourcedir" value="."></property>
+
+
<property name="distdir" value="dist"></property>
<property name="javadocdir" value="target/docs/apidocs"></property>
<property name="final.name" value="commons-jelly-1.0-beta-4"></property>
<target name="init" description="o Initializes some properties">
-
+ <mkdir dir="lib"></mkdir>
<condition property="noget">
<equals arg2="only" arg1="${build.sysclasspath}"></equals>
</condition>
@@ -38,9 +55,7 @@
<copy todir="${classesdir}">
-
-
- <fileset dir="${basedir}">
+ <fileset dir="${resourcedir}">
<include name="**/*.properties"></include>
@@ -51,6 +66,8 @@
+
+
</target>
<target name="jar" description="o Create the jar" depends="compile,test">
@@ -71,54 +88,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="C:\workspace\jelly"></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>
-
-
-
-
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
+ <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>
+
+
- </fileset>
- </copy>
</target>
@@ -149,10 +169,9 @@
<target name="get-deps" unless="noget" depends="init">
- <mkdir dir="lib"></mkdir>
<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+optional/jars/ant-optional-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-beanutils-1.4-dev.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.4-dev.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-digester-SNAPSHOT.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-SNAPSHOT.jar";></get>
@@ -178,7 +197,8 @@
<get dest="lib/bsf-2.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/bsf/jars/bsf-2.2.jar";></get>
<get dest="lib/commons-betwixt-SNAPSHOT.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-betwixt/jars/commons-betwixt-SNAPSHOT.jar";></get>
<get dest="lib/commons-httpclient-SNAPSHOT.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-SNAPSHOT.jar";></get>
- <get dest="lib/commons-messenger-1.0-dev-3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-messenger/jars/commons-messenger-1.0-dev-3.jar";></get>
+ <get dest="lib/jetty-4.1-rc6.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/jetty/jars/jetty-4.1-rc6.jar";></get>
+ <get dest="lib/commons-messenger-1.0-dev-8.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-messenger/jars/commons-messenger-1.0-dev-8.jar";></get>
<get dest="lib/jms-1.0.2b.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/jms/jars/jms-1.0.2b.jar";></get>
<get dest="lib/isorelax-20020414.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/isorelax/jars/isorelax-20020414.jar";></get>
<get dest="lib/msv-20020414.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/msv/jars/msv-20020414.jar";></get>
@@ -195,7 +215,8 @@
<get dest="lib/saaj-1.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/saaj/jars/saaj-1.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>
--
To unsubscribe, e-mail: <mailto:commons-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@;jakarta.apache.org>
