conditional definition of junitreport

diff --git a/build/build-properties.xml b/build/build-properties.xml
index 2c01763eac9ae208b2a3a97a7fb4638980808ee8..2f4922b6d307baea67215c010e3d281774d952c6 100644 (file)
--- a/build/build-properties.xml
+++ b/build/build-properties.xml
@@ -98,6 +98,8 @@
             location="${aspectj.modules.dir}/tests"/>
                <jar-property name="junit.jar" 
                        location="${aspectj.modules.lib.dir}/junit/junit.jar"/>
+               <property name="junit.includes" 
+               value="**/*Test.java,**/**TestCase.java"/>      
     </target>
 
     <target name="init-taskdefs" 
@@ -119,11 +121,23 @@
                <taskdef name="junit"             
                        classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"
                        classpathref="ant.lib.path"/>
+           <available classname="org.apache.xalan.processor.TransformerFactoryImpl" 
+               property="xalan.available"
+               value="true">        
+               <classpath refid="ant.lib.path"/>
+           </available>
+        <condition property="junitreport.available" value="true">
+               <istrue value="${xalan.available}"/>
+       </condition>
+        <echo message="junitreport.available: ${junitreport.available}"/>
+        <antcall target="init-junitreport"/>
+    </target>
+
+    <target name="init-junitreport" depends="init-properties"
+        if="xalan.available">
                <taskdef name="junitreport"             
                        classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"
                        classpathref="ant.lib.path"/>
-
-      <property name="init-taskdefs.done" value="done"/>
     </target>
 
     <target name="init-directories" 
@@ -219,7 +233,9 @@
                <attribute name="dir"/>
                <sequential>
                        <mkdir dir="@{dir}"/>
-                       <delete dir="@{dir}"/>
+                       <delete>
+                       <fileset dir="@{dir}" includes="*"/>
+               </delete>
                        <mkdir dir="@{dir}"/>
                </sequential>
        </macrodef>