Include build dates into artifacts.

19 files changed, 41 insertions, 23 deletions

diff --git a/org.jacoco.agent.rt.test/about.html b/org.jacoco.agent.rt.test/about.html
index 11e8eb7c..c4558055 100644
--- a/org.jacoco.agent.rt.test/about.html
+++ b/org.jacoco.agent.rt.test/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.agent.rt/about.html b/org.jacoco.agent.rt/about.html
index 38137653..5ab3ff27 100644
--- a/org.jacoco.agent.rt/about.html
+++ b/org.jacoco.agent.rt/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.agent.rt/buildhook.xml b/org.jacoco.agent.rt/buildhook.xml
index 16fa6faf..d0dd1caa 100644
--- a/org.jacoco.agent.rt/buildhook.xml
+++ b/org.jacoco.agent.rt/buildhook.xml
@@ -66,7 +66,7 @@
 				

 			</jacocobuild:renamedclassfileset>

 			

-			<file file="${source.bundle.dir}/about.html"/>

+			<file file="${result.temp.bundle.about.file}"/>

 			

 		</jar>

 	</target>

diff --git a/org.jacoco.agent/about.html b/org.jacoco.agent/about.html
index 38137653..5ab3ff27 100644
--- a/org.jacoco.agent/about.html
+++ b/org.jacoco.agent/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.ant.test/about.html b/org.jacoco.ant.test/about.html
index a6f7d744..2cca61bd 100644
--- a/org.jacoco.ant.test/about.html
+++ b/org.jacoco.ant.test/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.ant/about.html b/org.jacoco.ant/about.html
index 38137653..5ab3ff27 100644
--- a/org.jacoco.ant/about.html
+++ b/org.jacoco.ant/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.ant/buildhook.xml b/org.jacoco.ant/buildhook.xml
index 15543617..ff52d4d5 100644
--- a/org.jacoco.ant/buildhook.xml
+++ b/org.jacoco.ant/buildhook.xml
@@ -48,7 +48,7 @@
 				<attribute name="Implementation-Vendor" value="Mountainminds GmbH &amp; Co. KG"/>

 				<attribute name="Implementation-Version" value="${qualified.bundle.version}"/>

 			</manifest>		

-			<file file="${source.bundle.dir}/about.html"/>

+			<file file="${result.temp.bundle.about.file}"/>

 			<file file="${result.dist.lib.dir}/jacocoagent.jar"/>

 			<fileset dir="${result.tmp.bundle.classes.dir}"/>

 			<fileset dir="${toString:bundle-org.jacoco.report}" excludes="**/*.class"/>

diff --git a/org.jacoco.build/about.html b/org.jacoco.build/about.html
index 11e8eb7c..c4558055 100644
--- a/org.jacoco.build/about.html
+++ b/org.jacoco.build/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.build/build.xml b/org.jacoco.build/build.xml
index 67cda671..48e4e5cb 100644
--- a/org.jacoco.build/build.xml
+++ b/org.jacoco.build/build.xml
@@ -37,6 +37,7 @@
 	<property name="jacoco.home.url" value="http://www.eclemma.org/jacoco"/>

 	

 	<tstamp>

+		<format property="build.date" pattern="yyyy/MM/dd" timezone="GMT+0"/>

 		<format property="build.qualifier" pattern="yyyyMMddHHmmss" timezone="GMT+0"/>

 	</tstamp>

 

diff --git a/org.jacoco.build/buildbundle.xml b/org.jacoco.build/buildbundle.xml
index f5684549..653c7a28 100644
--- a/org.jacoco.build/buildbundle.xml
+++ b/org.jacoco.build/buildbundle.xml
@@ -65,16 +65,26 @@
 		<property name="qualified.bundle.version" value="${manifest.Bundle-Version}"/>

 	</target>

 	

-	<target name="runcustompackage" if="do.custompackage" depends="manifest">

+	<target name="about">

+		<property name="source.bundle.about.file" location="${source.bundle.dir}/about.html"/>

+		<property name="result.temp.bundle.about.file" location="${result.tmp.bundle.dir}/about.html"/>

+		<copy file="${source.bundle.about.file}" tofile="${result.temp.bundle.about.file}">

+			<filterset>

+				<filter token="DATE" value="${build.date}"/>

+			</filterset>

+		</copy>

+	</target>

+	

+	<target name="runcustompackage" if="do.custompackage" depends="manifest,about">

 		<antcall target="custompackage" inheritall="true" inheritrefs="true"/>

 	</target>

 	

-	<target name="package" if="do.package" depends="compile,runcustompackage,manifest">

+	<target name="package" if="do.package" depends="compile,runcustompackage,manifest,about">

 		<property name="result.dist.bundle.jar.file" location="${result.dist.lib.dir}/${manifest.Bundle-SymbolicName}_${qualified.bundle.version}.jar"/>

 		<mkdir dir="${result.dist.lib.dir}"/>

 		<jar destfile="${result.dist.bundle.jar.file}" manifest="${result.temp.bundle.manifest.file}" level="9">

 			<fileset dir="${result.tmp.bundle.classes.dir}"/>

-			<file file="${source.bundle.dir}/about.html"/>

+			<file file="${result.temp.bundle.about.file}"/>

 		</jar>

 	</target>

 	

diff --git a/org.jacoco.core.test/about.html b/org.jacoco.core.test/about.html
index 11e8eb7c..c4558055 100644
--- a/org.jacoco.core.test/about.html
+++ b/org.jacoco.core.test/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/perf/PerfOutputWriter.java b/org.jacoco.core.test/src/org/jacoco/core/test/perf/PerfOutputWriter.java
index 87d183dc..abde2055 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/perf/PerfOutputWriter.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/perf/PerfOutputWriter.java
@@ -16,6 +16,8 @@ import static java.lang.String.format;
 

 import java.io.PrintWriter;

 

+import org.jacoco.core.JaCoCo;

+

 /**

  * Formatted text output.

  * 

@@ -32,6 +34,12 @@ public class PerfOutputWriter implements IPerfOutput {
 	}

 

 	private void writeHeader() {

+		writer.printf("JaCoCo Performance Data%n%n");

+		writer.printf("JaCoCo Version:  %s%n", JaCoCo.VERSION);

+		writer.printf("JVM Vendor:      %s%n", System

+				.getProperty("java.vm.vendor"));

+		writer.printf("JVM Version:     %s%n%n", System

+				.getProperty("java.vm.version"));

 		writer

 				.println("scenario                         instr     ref    overhead");

 		writer

@@ -62,19 +70,17 @@ public class PerfOutputWriter implements IPerfOutput {
 

 	private void writeResult(final String description, final double subject,

 			String fmt, String unit) {

-		writer.printf("%-30s%8s         %-6s", description, format(fmt, Double

-				.valueOf(subject)), unit);

-		writer.println();

+		writer.printf("%-30s%8s         %-6s%n", description, format(fmt,

+				Double.valueOf(subject)), unit);

 	}

 

 	private void writeResult(final String description, final double subject,

 			final double reference, String fmt, String unit) {

 		double overhead = 100 * (subject - reference) / reference;

-		writer.printf("%-30s%8s%8s %-6s%4.0f%%", description, format(fmt,

+		writer.printf("%-30s%8s%8s %-6s%4.0f%%%n", description, format(fmt,

 				Double.valueOf(subject)),

 				format(fmt, Double.valueOf(reference)), unit, Double

 						.valueOf(overhead));

-		writer.println();

 	}

 

 }

diff --git a/org.jacoco.core/about.html b/org.jacoco.core/about.html
index 11e8eb7c..c4558055 100644
--- a/org.jacoco.core/about.html
+++ b/org.jacoco.core/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.doc/about.html b/org.jacoco.doc/about.html
index 11e8eb7c..c4558055 100644
--- a/org.jacoco.doc/about.html
+++ b/org.jacoco.doc/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.doc/buildhook.xml b/org.jacoco.doc/buildhook.xml
index 50aebbf4..5f0f3753 100644
--- a/org.jacoco.doc/buildhook.xml
+++ b/org.jacoco.doc/buildhook.xml
@@ -140,6 +140,7 @@
 		<copy todir="${result.dist.dir}">

 			<fileset dir="${source.bundle.dir}/docroot" includes="**/*.html"/>

 			<filterset>

+				<filter token="DATE"    value="${build.date}"/>

 				<filter token="VERSION" value="${qualified.bundle.version}"/>

 				<filter token="HOMEURL" value="${jacoco.home.url}"/>

 			</filterset>

diff --git a/org.jacoco.doc/docroot/index.html b/org.jacoco.doc/docroot/index.html
index 7e9f753e..c6a5cf2d 100644
--- a/org.jacoco.doc/docroot/index.html
+++ b/org.jacoco.doc/docroot/index.html
@@ -22,7 +22,7 @@
 </p>

 

 <p>

-  This is the distribution of version @VERSION@.

+  This is the distribution of version @VERSION@ created on @DATE@.

 </p>

 

 <h2>Implementation Status</h2>

diff --git a/org.jacoco.examples/about.html b/org.jacoco.examples/about.html
index 11e8eb7c..c4558055 100644
--- a/org.jacoco.examples/about.html
+++ b/org.jacoco.examples/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.report.test/about.html b/org.jacoco.report.test/about.html
index 00397c16..22b0dcaa 100644
--- a/org.jacoco.report.test/about.html
+++ b/org.jacoco.report.test/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>
diff --git a/org.jacoco.report/about.html b/org.jacoco.report/about.html
index d3afaf37..199bdb9f 100644
--- a/org.jacoco.report/about.html
+++ b/org.jacoco.report/about.html
@@ -8,7 +8,7 @@
 <h2>About This Content</h2>
 
 <p>
-  2010/04/01
+  @DATE@
 </p>
 
 <h3>License</h3>