From a7efe68e5e40fc951ac7d79f17298b1e7129a952 Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Wed, 7 Jan 2009 16:38:20 +0000
Subject: Only define cobertura task definition  when it's about to get used.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@732390 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/build.xml  | 2 +-
 qpid/java/common.xml | 6 ++++--
 qpid/java/module.xml | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index a97a775e08..fee47d59ca 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -195,7 +195,7 @@
     <delete dir="${tasks.classes}"/>
   </target>
 
-  <target name="coverage-report" description="generate coverage report">
+  <target name="coverage-report" description="generate coverage report" depends="cobertura-init">
     <cobertura-merge datafile="${build.coveragereport}/cobertura.ser">
       <!-- merge all module coverage reports -->
       <fileset dir="${build}">
diff --git a/qpid/java/common.xml b/qpid/java/common.xml
index 146781ec23..e9e007c8ef 100644
--- a/qpid/java/common.xml
+++ b/qpid/java/common.xml
@@ -61,8 +61,6 @@
     </fileset>
   </path>
 
-  <taskdef classpathref="cobertura.classpath" resource="tasks.properties" />
-
   <macrodef name="indirect">
     <attribute name="name"/>
     <attribute name="variable"/>
@@ -134,6 +132,10 @@
     </junitreport>
   </target>
 
+  <target name="cobertura-init">
+    <taskdef classpathref="cobertura.classpath" resource="tasks.properties" />
+  </target>
+
   <target name="help" description="display detailed build documentation">
     <echo>
   ant build
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index a9bd9a2b2a..422d2e1057 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -470,7 +470,7 @@
     <delete dir="${module.instrumented}"/>
   </target>
 
-  <target name="instrument">
+  <target name="instrument" depends="cobertura-init">
     <cobertura-instrument todir="${module.instrumented}"
                           datafile="${cobertura.datafile}">
       <fileset dir="${module.classes}">
@@ -530,7 +530,7 @@
     </junit>
   </target>
 
-  <target name="coverage-report">
+  <target name="coverage-report" depends="cobertura-init">
       <echo message="${cobertura.datafile}"/>
       <cobertura-report format="html"
                       destdir="${module.coverage}"
-- 
cgit v1.2.1