hlship 2004/08/18 15:48:23
Modified: hivebuild dependency.xml jar-module.xml
jar-module.properties
framework build.xml
Log:
Allow junit to be a compile dependency when necessary.
Revision Changes Path
1.6 +2 -2 jakarta-hivemind/hivebuild/dependency.xml
Index: dependency.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/hivebuild/dependency.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dependency.xml 10 Aug 2004 14:25:16 -0000 1.5
+++ dependency.xml 18 Aug 2004 22:48:23 -0000 1.6
@@ -76,11 +76,11 @@
<sequential>
<mkdir dir="${module.lib.dir}/@{use}"/>
- <copy file="@{fromdir}/@[EMAIL PROTECTED]"
todir="${module.lib.dir}/@{use}"/>
+ <copy file="@{fromdir}/@[EMAIL PROTECTED]"
todir="${module.lib.dir}/@{use}" verbose="true"/>
<!-- Delete versions in the wrong directory, or out of date versions.
-->
- <delete>
+ <delete verbose="true">
<fileset dir="${module.lib.dir}">
<exclude name="@{use}/@[EMAIL PROTECTED]"/>
<include name="**/@{artifact}-*.jar"/>
1.8 +1 -1 jakarta-hivemind/hivebuild/jar-module.xml
Index: jar-module.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/hivebuild/jar-module.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jar-module.xml 10 Aug 2004 14:40:19 -0000 1.7
+++ jar-module.xml 18 Aug 2004 22:48:23 -0000 1.8
@@ -141,7 +141,7 @@
description="Reference to a path used to compile unit
tests."/>
<sequential>
- <ibiblio-dependency artifact="junit" version="3.8.1" group="junit"
use="test"/>
+ <ibiblio-dependency artifact="junit" version="3.8.1" group="junit"
use="${module.junit.use}"/>
<mkdir dir="${test.classes.dir}"/>
1.4 +4 -1 jakarta-hivemind/hivebuild/jar-module.properties
Index: jar-module.properties
===================================================================
RCS file: /home/cvs/jakarta-hivemind/hivebuild/jar-module.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jar-module.properties 28 Jul 2004 19:19:35 -0000 1.3
+++ jar-module.properties 18 Aug 2004 22:48:23 -0000 1.4
@@ -50,4 +50,7 @@
module.junit.fork=on
module.junit.forkmode=once
module.junit.includeantruntime=on
-module.junit.jar=junit-${module.junit.version}.jar
\ No newline at end of file
+module.junit.jar=junit-${module.junit.version}.jar
+
+# Override this to compile if java sources uses JUnit classes.
+module.junit.use=test
\ No newline at end of file
1.13 +3 -0 jakarta-hivemind/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 10 Aug 2004 14:25:16 -0000 1.12
+++ build.xml 18 Aug 2004 22:48:23 -0000 1.13
@@ -17,6 +17,9 @@
<project name="HiveMind Framework" default="jar" basedir=".">
<property name="module.name" value="hivemind"/>
<property name="javadoc.package" value="org.apache.hivemind.*"/>
+
+ <property name="module.junit.use" value="compile"/>
+
<property name="root.dir" value=".."/>
<import file="${root.dir}/hivebuild/jar-module.xml"/>
<import file="${hivebuild.dir}/javadoc-report.xml"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
