Include the report bundle with the build.
diff --git a/org.jacoco.build/build.xml b/org.jacoco.build/build.xml
index 2e0f1f4..51e7a7a 100644
--- a/org.jacoco.build/build.xml
+++ b/org.jacoco.build/build.xml
@@ -2,7 +2,11 @@
<project name="org.jacoco.build.all" default="rebuildall" basedir=".">
- <fail message="Please specify property 'target.plugins.dir'" unless="target.plugins.dir"/>
+ <description>
+ This is the main build file for the JaCoCo build.
+ </description>
+
+ <import file="target.xml"/>
<property name="target.plugins.dir" location="C:/devtools/eclipse3.4.1/plugins"/>
<property name="workspace.dir" location=".."/>
@@ -19,32 +23,7 @@
<format property="build.qualifier" pattern="yyyyMMddHHmmss"/>
</tstamp>
- <fail message="JaCoCo should only be compiled against Java 1.5">
- <condition>
- <not>
- <equals arg1="${ant.java.version}" arg2="1.5"/>
- </not>
- </condition>
- </fail>
-
-
- <!-- ===================================================================
- External Target Dependencies
- =================================================================== -->
-
- <path id="bundle-org.objectweb.asm">
- <fileset dir="${target.plugins.dir}" includes="org.objectweb.asm_3.1.0.*.jar"/>
- </path>
- <path id="bundle-org.apache.ant">
- <fileset dir="${target.plugins.dir}" includes="org.apache.ant_*/ant.jar"/>
- </path>
-
- <path id="bundle-org.junit4">
- <fileset dir="${target.plugins.dir}" includes="org.junit4_*/junit.jar"/>
- </path>
-
-
<macrodef name="runbundlebuild">
<attribute name="bundleid"/>
<attribute name="target"/>
@@ -62,10 +41,19 @@
<macrodef name="runallbundlebuilds">
<attribute name="target"/>
<sequential>
+ <!-- Build tools -->
<runbundlebuild bundleid="org.jacoco.build" target="@{target}"/>
+
+ <!-- Implementation -->
<runbundlebuild bundleid="org.jacoco.core" target="@{target}"/>
- <runbundlebuild bundleid="org.jacoco.core.test" target="@{target}"/>
<runbundlebuild bundleid="org.jacoco.agent" target="@{target}"/>
+ <runbundlebuild bundleid="org.jacoco.report" target="@{target}"/>
+
+ <!-- Tests -->
+ <runbundlebuild bundleid="org.jacoco.core.test" target="@{target}"/>
+ <runbundlebuild bundleid="org.jacoco.report.test" target="@{target}"/>
+
+ <!-- Documentation -->
<runbundlebuild bundleid="org.jacoco.doc" target="@{target}"/>
</sequential>
</macrodef>
diff --git a/org.jacoco.build/buildbundle.xml b/org.jacoco.build/buildbundle.xml
index 54ea9d6..d0aa691 100644
--- a/org.jacoco.build/buildbundle.xml
+++ b/org.jacoco.build/buildbundle.xml
@@ -2,6 +2,12 @@
<project name="org.jacoco.build.bundle" default="package">
+ <description>
+ This build file is executed for every JaCoCo bundle. Every bundle must
+ contain a buildhook.xml file that gets imported into this build file and
+ customizes the specific build actions for the bundle.
+ </description>
+
<property name="source.bundle.dir" location="${basedir}"/>
<property name="source.bundle.java.dir" location="${source.bundle.dir}/src"/>
diff --git a/org.jacoco.build/target.xml b/org.jacoco.build/target.xml
new file mode 100644
index 0000000..e450e76
--- /dev/null
+++ b/org.jacoco.build/target.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="target">
+
+ <description>
+ This file specifies the build target dependencies.
+ </description>
+
+ <fail message="JaCoCo should only be compiled against Java 1.5">
+ <condition>
+ <not>
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ </not>
+ </condition>
+ </fail>
+
+
+ <!-- These following path declarations assume that all libraries are
+ avaiable as standard Eclipse bundles. -->
+
+ <fail message="Please specify property 'target.plugins.dir'" unless="target.plugins.dir"/>
+
+ <path id="bundle-org.objectweb.asm">
+ <fileset dir="${target.plugins.dir}" includes="org.objectweb.asm_3.1.0.*.jar"/>
+ </path>
+
+ <path id="bundle-org.apache.ant">
+ <fileset dir="${target.plugins.dir}" includes="org.apache.ant_*/ant.jar"/>
+ </path>
+
+ <path id="bundle-org.junit4">
+ <fileset dir="${target.plugins.dir}" includes="org.junit4_*/junit.jar"/>
+ </path>
+
+</project>
\ No newline at end of file
diff --git a/org.jacoco.doc/buildhook.xml b/org.jacoco.doc/buildhook.xml
index 6e999c7..a654ec3 100644
--- a/org.jacoco.doc/buildhook.xml
+++ b/org.jacoco.doc/buildhook.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.jacoco.build.buildhook">
+<project name="org.jacoco.doc.buildhook">
<property name="do.customverify" value="true"/>
<property name="do.customdoc" value="true"/>
diff --git a/org.jacoco.doc/docroot/doc/index.html b/org.jacoco.doc/docroot/doc/index.html
index 9e5c8b2..bcb01c0 100644
--- a/org.jacoco.doc/docroot/doc/index.html
+++ b/org.jacoco.doc/docroot/doc/index.html
@@ -17,6 +17,7 @@
<li>API Documentation
<ul>
<li><a href="org.jacoco.core/index.html"><code>org.jacoco.core</code></a></li>
+ <li><a href="org.jacoco.report/index.html"><code>org.jacoco.report</code></a></li>
</ul>
</li>
<li><a href="license.html">License</a></li>
diff --git a/org.jacoco.report.test/buildhook.xml b/org.jacoco.report.test/buildhook.xml
index b30927e..911b80e 100644
--- a/org.jacoco.report.test/buildhook.xml
+++ b/org.jacoco.report.test/buildhook.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.jacoco.build.buildhook">
+<project name="org.jacoco.report.test.buildhook">
<path id="dependencies">
<path refid="bundle-org.jacoco.core"/>
diff --git a/org.jacoco.report/buildhook.xml b/org.jacoco.report/buildhook.xml
index 3350d89..4885660 100644
--- a/org.jacoco.report/buildhook.xml
+++ b/org.jacoco.report/buildhook.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.jacoco.build.buildhook">
+<project name="org.jacoco.report.buildhook">
<path id="dependencies">
<path refid="bundle-org.jacoco.core"/>