Author: nextgens
Date: 2006-05-11 17:13:10 +0000 (Thu, 11 May 2006)
New Revision: 8658
Modified:
trunk/freenet/build.xml
trunk/freenet/src/freenet/node/Version.java
Log:
Small hack to ensure we show the right svn revision on fproxy
Modified: trunk/freenet/build.xml
===================================================================
--- trunk/freenet/build.xml 2006-05-11 16:02:26 UTC (rev 8657)
+++ trunk/freenet/build.xml 2006-05-11 17:13:10 UTC (rev 8658)
@@ -13,6 +13,7 @@
<property name="lib" location="lib"/>
<property name="freenet-ext.location" location="${lib}/freenet-ext.jar"/>
<property name="javadoc" location="javadoc"/>
+ <property name="svn.revision" value="@custom@"/>
<target name="mkdir">
@@ -37,6 +38,13 @@
<target name="compile" depends="get-extjar">
<!-- Create the time stamp -->
<tstamp/>
+
+ <!-- Update the Version file -->
+
+ <replace file="${src}/freenet/node/Version.java">
+ <replacefilter token="@custom@" value="${svn.revision}"/>
+ </replace>
+
<!-- Create the build directory structure used by compile -->
<!-- FIXME: remove the debug and replace with optimize -->
@@ -72,11 +80,11 @@
<attribute name="Main-Class" value="freenet/node/Node"/>
<attribute name="Built-By" value="${user.name}"/>
<section name="common">
- <attribute name="Specification-Title" value="Example"/>
+ <attribute name="Specification-Title" value="Freenet"/>
<attribute name="Specification-Version" value="0.7pre"/>
<attribute name="Specification-Vendor" value="freenetproject.org"/>
<attribute name="Implementation-Title" value="Freenet"/>
- <attribute name="Implementation-Version" value="0.7pre ${TODAY}"/>
+ <attribute name="Implementation-Version" value="0.7pre ${TODAY}
${svn.revision}"/>
<attribute name="Implementation-Vendor" value="Freenetproject.org"/>
</section>
</manifest>
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-11 16:02:26 UTC (rev
8657)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-11 17:13:10 UTC (rev
8658)
@@ -46,17 +46,8 @@
public static final int lastGoodStableBuild = 1;
/** Revision number of Version.java as read from CVS */
- public static final String cvsRevision;
+ public static final String cvsRevision = "@custom@";
- private static boolean logDEBUG =
Logger.shouldLog(Logger.DEBUG,Version.class);
- static {
- StringTokenizer cvsId =
- new StringTokenizer("$Id$");
- cvsId.nextToken();
- cvsId.nextToken();
- cvsRevision = cvsId.nextToken();
- }
-
/**
* @return the node's version designators as an array
*/
Property changes on: trunk/freenet/src/freenet/node/Version.java
___________________________________________________________________
Name: svn:keywords
- Id
