From 7213ff0c76fb235080e83265b9d43d033b2cc3f6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 15 Jan 2012 16:36:17 +0000
Subject: [PATCH]   * Build: Put Implementation-Version in manifests

---
 apps/addressbook/build.xml                               | 2 ++
 apps/i2psnark/java/build.xml                             | 2 ++
 apps/i2ptunnel/java/build.xml                            | 2 ++
 apps/ministreaming/java/build.xml                        | 1 +
 apps/routerconsole/java/build.xml                        | 2 ++
 .../java/src/net/i2p/router/web/FileDumpHelper.java      | 9 +++++----
 apps/sam/java/build.xml                                  | 1 +
 apps/streaming/java/build.xml                            | 1 +
 apps/susidns/src/build.xml                               | 1 +
 apps/susimail/build.xml                                  | 1 +
 apps/systray/java/build.xml                              | 1 +
 build.xml                                                | 4 +++-
 core/java/build.xml                                      | 1 +
 router/java/build.xml                                    | 1 +
 14 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/apps/addressbook/build.xml b/apps/addressbook/build.xml
index 2fe77475cb..ad27a00905 100644
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@@ -55,6 +55,7 @@
 		<property name="workspace.changes" value="" />
 			<manifest>
 				<attribute name="Main-Class" value="addressbook.Daemon"/>
+				<attribute name="Implementation-Version" value="${full.version}" />
 		                <attribute name="Build-Date" value="${build.timestamp}" />
 		                <attribute name="Base-Revision" value="${workspace.version}" />
 		                <attribute name="Workspace-Changes" value="${workspace.changes}" />
@@ -73,6 +74,7 @@
 		<property name="workspace.changes.tr" value="" />
 		<war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}">
 			<manifest>
+				<attribute name="Implementation-Version" value="${full.version}" />
 		                <attribute name="Build-Date" value="${build.timestamp}" />
 		                <attribute name="Base-Revision" value="${workspace.version}" />
 		                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index edc92ed5b1..c5a3b106fd 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -60,6 +60,7 @@
             <manifest>
                 <attribute name="Main-Class" value="org.klomp.snark.Snark" />
                 <attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
@@ -98,6 +99,7 @@
           <!-- include only the web stuff, as of 0.7.12 the router will add i2psnark.jar to the classpath for the war -->
           <classes dir="./build/obj" includes="**/web/*.class" />
             <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 1778ffb872..1b62279145 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -62,6 +62,7 @@
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.i2ptunnel.I2PTunnel" />
                 <attribute name="Class-Path" value="i2p.jar mstreaming.jar" />
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.j.tr}" />
@@ -134,6 +135,7 @@
         <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
              basedir="../jsp/" excludes="web.xml, web-fragment.xml, web-out.xml, **/*.java, *.jsp">
             <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.w.tr}" />
diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
index 8904bafb3b..235088fc31 100644
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -50,6 +50,7 @@
         <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index f49153486c..f8014d8d12 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -90,6 +90,7 @@
                 <!-- top level installer will rename to jrobin.jar -->
                 <!-- DTG added in 0.8.4, not in the classpath for very old installs, before we changed wrapper.config to specify * -->
                 <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar" />
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.j.tr}" />
@@ -169,6 +170,7 @@
         <war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
              basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, *.jsi, web-fragment.xml, web-out.xml">
             <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.w.tr}" />
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java
index 6c95734f7b..eea306aa20 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java
@@ -113,17 +113,18 @@ public class FileDumpHelper extends HelperBase {
         if (att == null)
             att = new Attributes();
         buf.append("<td align=\"center\">");
+        String iv = getAtt(att, "Implementation-Version");
+        if (iv != null)
+            buf.append("<b>").append(iv).append("</b>");
         String s = getAtt(att, "Base-Revision");
         if (s != null && s.length() > 20) {
+            if (iv != null)
+                buf.append("<br>");
             buf.append("<a href=\"http://stats.i2p/cgi-bin/viewmtn/revision/info/").append(s)
                .append("\">" +
                        "<tt>").append(s.substring(0, 20)).append("</tt>" +
                        "<br>" +
                        "<tt>").append(s.substring(20)).append("</tt></a>");
-        } else {
-            s = getAtt(att, "Implementation-Version");
-            if (s != null)
-                buf.append("<b>").append(s).append("</b>");
         }
         buf.append("</td><td>");
         s = getAtt(att, "Created-By");
diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index d55ed0d61c..4433c05754 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -66,6 +66,7 @@
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.sam.SAMBridge" />
                 <attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
index b5c842f5b9..5f278f307c 100644
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -63,6 +63,7 @@
         <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/streaming.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index d287e5a4d0..3fff55a34c 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -97,6 +97,7 @@
         		<include name="WEB-INF/classes/${project}.properties"/>
         	</fileset>
             <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index 8a8d33c4ad..3368283d11 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -45,6 +45,7 @@
         <war destfile="susimail.war" webxml="src/WEB-INF/web.xml"
              basedir="src/" excludes="WEB-INF/web.xml LICENSE src/**/*">
             <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/systray/java/build.xml b/apps/systray/java/build.xml
index 4dd50f0c98..5baf4ab622 100644
--- a/apps/systray/java/build.xml
+++ b/apps/systray/java/build.xml
@@ -44,6 +44,7 @@
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.apps.systray.SysTray" />
                 <attribute name="Class-Path" value="systray4j.jar" />
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/build.xml b/build.xml
index dd49fd8cb5..298f080893 100644
--- a/build.xml
+++ b/build.xml
@@ -182,12 +182,14 @@
         </exec>
     </target>
 
-    <target name="buildProperties" depends="getMtnRev" >
+    <target name="buildProperties" depends="getMtnRev, getReleaseNumber, getBuildNumber" >
         <!-- default if not set above -->
         <property name="workspace.version" value="unknown" />
         <tstamp>
             <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
         </tstamp>
+        <property name="full.version" value="${release.number}-${build.number}${build.extra}" />
+        <echo message="Building version ${full.version}" />
     </target>
 
     <!-- end of sub-build.xml targets -->
diff --git a/core/java/build.xml b/core/java/build.xml
index d627508594..c3eaf5c078 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -58,6 +58,7 @@
         <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/i2p.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/router/java/build.xml b/router/java/build.xml
index ea9f7b6135..e933086cf8 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -72,6 +72,7 @@
         <property name="workspace.changes.tr" value="" />
         <jar destfile="./build/router.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />