jon 01/03/11 18:28:02
Modified: build build-testcases.xml build-velocity.xml
Log:
added test-clean target
added more stuff to the dist target as well as a dependency on test-clean
Revision Changes Path
1.8 +7 -0 jakarta-velocity/build/build-testcases.xml
Index: build-testcases.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity/build/build-testcases.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build-testcases.xml 2001/03/12 01:24:22 1.7
+++ build-testcases.xml 2001/03/12 02:27:59 1.8
@@ -5,6 +5,7 @@
<property name="build.dest" value="${build.dir}/classes"/>
<property name="ant.home" value="."/>
+ <property name="test.home" value="../test"/>
<property name="junit.jar" value="lib/junit-3.2.jar"/>
<!-- JUnit Testbed properties -->
@@ -114,6 +115,12 @@
<pathelement location="${build.dest}"/>
</classpath>
</java>
+ </target>
+
+ <target name="test-clean">
+ <delete>
+ <fileset dir="${test.home}/templates/results" includes="**/*.res"/>
+ </delete>
</target>
</project>
1.43 +20 -3 jakarta-velocity/build/build-velocity.xml
Index: build-velocity.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity/build/build-velocity.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- build-velocity.xml 2001/03/11 22:20:44 1.42
+++ build-velocity.xml 2001/03/12 02:28:00 1.43
@@ -366,7 +366,7 @@
<!-- =================================================================== -->
<!-- Package -->
<!-- =================================================================== -->
- <target name="dist" depends="jar,javadocs">
+ <target name="dist" depends="test-clean,jar,javadocs">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/src/java"/>
@@ -389,11 +389,23 @@
</fileset>
</copy>
+ <copy todir="${dist.dir}/convert">
+ <fileset dir="../convert">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
<copy todir="${dist.dir}/examples">
<fileset dir="../examples">
<include name="**"/>
</fileset>
</copy>
+
+ <copy todir="${dist.dir}/test">
+ <fileset dir="../test">
+ <include name="**"/>
+ </fileset>
+ </copy>
<chmod file="${dist.dir}/examples/test.sh" perm="+x"/>
@@ -540,8 +552,13 @@
<target name="test"
depends="compile"
description="--> Run the testcases">
- <ant antfile="build-testcases.xml"/>
- </target>
+ <ant antfile="build-testcases.xml" target="test-all"/>
+ </target>
+
+ <target name="test-clean"
+ description="--> Cleanup after the testcases">
+ <ant antfile="build-testcases.xml" target="test-clean"/>
+ </target>
<!-- =================================================================== -->
<!-- Forum Demo Web App -->
