jicarilla-sandbox/buildsystem build-project.xml,1.10,1.11

Update of /cvsroot/jicarilla/jicarilla-sandbox/buildsystem
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6403/buildsystem

Modified Files:
	build-project.xml 
Log Message:
automated reports generation improvements, mainly prepping for nightly clover reports

Index: build-project.xml
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/buildsystem/build-project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- build-project.xml	12 Feb 2004 23:46:26 -0000	1.10
+++ build-project.xml	18 Feb 2004 18:16:23 -0000	1.11
@@ -169,6 +169,11 @@
          </echo>
     </target>
 
+    <target name="jbs:reports" unless="no.source.dir"
+            depends="jbs:clover,jbs:javadocs,jbs:java-test-reports">
+
+    </target>
+
     <!-- Basic functionality -->
 
     <target name="jbs:init">
@@ -185,7 +190,7 @@
         <property name="jbs.compile.debug" value="on"/>
         <property name="jbs.compile.optimize" value="off"/>
         <property name="jbs.compile.deprecation" value="off"/>
-        <property name="jbs.junit.fork" value="off"/>
+        <property name="jbs.junit.fork" value="yes"/>
         <property name="jbs.junit.dir" value="${basedir}"/>
         <property name="jbs.junit.usefile" value="true"/>
 
@@ -280,30 +285,33 @@
    Running tests for ${project.name}
 ======================================================================</echo>
         <taskdef
-          name="junit"
-          classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
+                name="junit"
+                classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
 
         <mkdir dir="${jbs.build.dir}/test-reports"/>
 
         <junit printSummary="yes"
-               failureProperty="jbs.test.failure"
-               fork="${jbs.junit.fork}"
-               dir="${jbs.junit.dir}">
-          <sysproperty key="basedir" value="${basedir}"/>
+                failureProperty="jbs.test.failure"
+                fork="${jbs.junit.fork}"
+                dir="${jbs.junit.dir}">
+            <sysproperty key="basedir" value="${basedir}"/>
 
-          <formatter type="xml"/>
-          <formatter type="plain" usefile="${jbs.junit.usefile}"/>
-          <classpath>
-              <pathelement location="${jbs.build.dir}/classes"/>
-              <pathelement location="${jbs.build.dir}/test-classes"/>
-              <pathelement path="${dependency.classpath}"/>
-          </classpath>
-          <batchtest todir="${jbs.build.dir}/test-reports">
-            <fileset dir="${jbs.src.dir}/test">
-                <include name="**/*TestCase.java"/>
-                <exclude name="**/*Abstract*"/>
-            </fileset>
-          </batchtest>
+            <formatter type="xml"/>
+            <formatter type="plain" usefile="${jbs.junit.usefile}"/>
+            <classpath>
+                <pathelement location="${jbs.build.dir}/classes"/>
+                <pathelement location="${jbs.build.dir}/test-classes"/>
+                <pathelement path="${dependency.classpath}"/>
+                <fileset dir="${ant.home}/lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+            </classpath>
+            <batchtest todir="${jbs.build.dir}/test-reports">
+                <fileset dir="${jbs.src.dir}/test">
+                    <include name="**/*TestCase.java"/>
+                    <exclude name="**/*Abstract*"/>
+                </fileset>
+            </batchtest>
         </junit>
     </target>
 
@@ -326,7 +334,7 @@
     <target name="jbs:bin-jar" if="java.src.present"
             depends="jbs:init, jbs:compile, jbs:test">
         <echo>=======================================================================
- Generating test reports for ${project.name}
+ Generating jar for ${project.name}
 =======================================================================</echo>
 
         <mkdir dir="${jbs.build.dir}/classes"/>
@@ -344,7 +352,7 @@
         <mkdir dir="${jbs.build.dir}/classes"/>
 
         <property name="copyright"
-          value="Copyright &amp;copy; ${project.copyright.year} Apache Software Foundation. All Rights Reserved." />
+          value="Copyright &amp;copy; ${project.copyright.year} Leo Simons. All Rights Reserved." />
 
         <property name="title" value="Avalon ${project.name} API"/>
 
@@ -365,6 +373,33 @@
         </javadoc>
     </target>
 
+    <target name="jbs:clover" if="test.src.present"
+            depends="jbs:init">
+        <echo>=======================================================================
+   Generating clover report for ${project.name}
+=======================================================================</echo>
+
+        <taskdef resource="clovertasks"/>
+        <typedef resource="clovertypes"/>
+
+        <mkdir dir="target/.clover_coverage"/>
+        <clover-setup initString="target/.clover_coverage/clover.db"/>
+
+        <delete dir="target/classes"/>
+        <mkdir dir="target/classes"/>
+        <delete dir="target/test-classes"/>
+        <mkdir dir="target/test-classes"/>
+        <antcall target="jbs:java-test"/>
+
+        <mkdir dir="target/docs/clover"/>
+        <clover-report>
+            <current outfile="target/docs/clover">
+                <format type="html"/>
+            </current>
+        </clover-report>
+
+    </target>
+
     <target name="jbs:distclean" depends="jbs:init">
         <delete dir="${jbs.build.dir}/${project.name}-${project.version}"/>
         <delete dir="${jbs.build.dir}/dist"/>



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click