User: user57
Date: 01/08/01 23:25:52
Modified: . Tag: jboss_buildmagic build.xml config.xml
Log:
o hooked up junit for each module's "tests" target, though it still needs
some fine tuning as to which classes to test.
o looked into junitreport again, but that task is a pile of...
Revision Changes Path
No revision
No revision
1.1.2.12 +38 -13 jbosstest/Attic/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/Attic/build.xml,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- build.xml 2001/08/02 03:45:32 1.1.2.11
+++ build.xml 2001/08/02 06:25:52 1.1.2.12
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.1.2.11 2001/08/02 03:45:32 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.1.2.12 2001/08/02 06:25:52 user57 Exp $ -->
<project default="main">
@@ -18,10 +18,15 @@
<!-- Basic module configuration -->
<!-- ================================================================== -->
+ <!--
+ | Give users a chance to use a different Buildmagic.
+ -->
+ <property file="${user.home}/.buildmagic.properties"/>
+
<!--
| Load Buildmagic Ant extentions.
-->
- <property name="planet57.buildmagic.root" value="../tools/planet57/buildmagic"/>
+ <property name="planet57.buildmagic.root"
value="${basedir}/../tools/planet57/buildmagic"/>
<property name="planet57.buildmagic.lib" value="${planet57.buildmagic.root}/lib"/>
<path id="planet57.buildmagic.classpath">
<fileset dir="${planet57.buildmagic.lib}">
@@ -50,14 +55,11 @@
| Include user, project and module property overrides.
|
| override.properties - Used rarely (ignore)
- | .buildmagic.properties - Provide Buildmagic specific properties
- | .ant.properties - Ant properties
| local.properties - User local module properties
| config.properties - Used rarely (ignore)
-->
<property file="${project.config}/override.properties"/>
<property file="${module.root}/override.properties"/>
- <property file="${user.home}/.buildmagic.properties"/>
<property file="${user.home}/.ant.properties"/>
<property file="${module.root}/local.properties"/>
<property file="${project.config}/local.properties"/>
@@ -223,9 +225,38 @@
| documentation compiles.
-->
<target name="compile"
- depends="compile-etc, compile-bin, all-compile"
+ depends="compile-classes, compile-resources, compile-etc, compile-bin,
all-compile"
description="Compile all source files."/>
+ <!-- Compile class files -->
+ <target name="compile-classes">
+ <mkdir dir="${build.classes}"/>
+ <javac destdir="${build.classes}"
+ optimize="${javac.optimize}"
+ target="${javac.target}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src path="${source.java}"/>
+ <classpath refid="javac.classpath"/>
+ <include name="org/jboss/test/util/**"/>
+ </javac>
+ </target>
+
+ <!-- Compile resource files -->
+ <target name="compile-resources">
+ <mkdir dir="${build.resources}"/>
+ <copy todir="${build.resources}" filtering="yes">
+ <fileset dir="${source.resources}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
<mkdir dir="${build.etc}"/>
@@ -385,7 +416,7 @@
<!-- Run tests -->
<!-- ================================================================== -->
- <target name="tests" depends="compile-tests"
+ <target name="tests" depends="all-tests"
description="Execute all tests.">
<!-- this should execute the entire testsuite -->
@@ -435,12 +466,6 @@
<target name="release-all" depends="release-zip, release-tgz"
description="Builds a distribution for each archive type."/>
-
-
- <!-- ================================================================== -->
- <!-- Module Pass-through Targets -->
- <!-- ================================================================== -->
-
<!-- ================================================================== -->
1.1.2.9 +17 -4 jbosstest/Attic/config.xml
Index: config.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/Attic/config.xml,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- config.xml 2001/08/02 03:45:32 1.1.2.8
+++ config.xml 2001/08/02 06:25:52 1.1.2.9
@@ -7,7 +7,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: config.xml,v 1.1.2.8 2001/08/02 03:45:32 user57 Exp $ -->
+<!-- $Id: config.xml,v 1.1.2.9 2001/08/02 06:25:52 user57 Exp $ -->
<!-- ================================================================== -->
<!-- Module Setup -->
@@ -23,7 +23,7 @@
<!-- Tool Setup -->
<!-- ================================================================== -->
- <!-- Apache Ant Optional Tasks -->
+ <!-- Apache Ant and Optional Tasks -->
<property name="apache.ant.root" value="${tools.root}/apache/ant"/>
<property name="apache.ant.lib" value="${apache.ant.root}/lib"/>
<property name="apache.ant.lib.ext" value="${apache.ant.lib}/ext"/>
@@ -250,6 +250,14 @@
<path refid="junit.junit.classpath"/>
</path>
+ <!-- Setup paths as properties to pass to children -->
+ <property name="testsuite.module.apache.ant.classpath"
+ refid="apache.ant.classpath"/>
+ <property name="testsuite.module.apache.ant.ext.classpath"
+ refid="apache.ant.ext.classpath"/>
+ <property name="testsuite.module.javac.classpath"
+ refid="javac.classpath"/>
+
<!-- Where source files live -->
<property name="source.java" value="${module.source}/main"/>
<property name="source.etc" value="${module.source}/etc"/>
@@ -342,10 +350,13 @@
<!-- Module groups -->
<group name="default">
- <include modules="bank, bench, bmp, cts, dbtest, hello"/>
+ <include modules="bank"/>
+ <!--
+ <include modules="bench, bmp, cts, dbtest, hello"/>
<include modules="jbossmq, jmsra, jrmp, load, lock, logging"/>
<include modules="mdb, naming, perf, readahead, security"/>
<include modules="testbean, threading, web, xa"/>
+ -->
</group>
</moduleconfig>
@@ -362,10 +373,12 @@
</target>
<!-- Executed at the end of the 'init' target -->
- <target name="init-hook">
+ <target name="init-hook" depends="module-configuration-setup">
<!-- Execute custom initialization tasks here. -->
<taskdef name="catfiles" classpathref="local.task.classpath"
classname="org.jboss.ant.taskdefs.ConcatenateFiles"/>
<taskdef name="junit" classpathref="junit.task.classpath"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
+ <taskdef name="junitreport" classpathref="junit.task.classpath"
+
classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"/>
</target>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
