[freenet-cvs] r7815 - in trunk/freenet: . src/freenet/node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-01-08 11:53:57 +0000 (Sun, 08 Jan 2006)
New Revision: 7815

Modified:
   trunk/freenet/build.xml
   trunk/freenet/src/freenet/node/Version.java
Log:
now build numbers are svn-revision dependants

Modified: trunk/freenet/build.xml
===================================================================
--- trunk/freenet/build.xml     2006-01-08 10:28:58 UTC (rev 7814)
+++ trunk/freenet/build.xml     2006-01-08 11:53:57 UTC (rev 7815)
@@ -9,28 +9,56 @@

   <!-- set global properties for this build -->
        <property name="src" location="src"/>
+       <property name="version_file" location="src/freenet/node/Version.java"/>
        <property name="build" location="build"/>
        <property name="lib"    location="lib"/>
        <property name="freenet-ext.location" 
location="${lib}/freenet-ext.jar"/>

+<!-- ================================================== -->
+<target name="get_revision" description="extract build number from svn" 
unless="svn.revision">
+    <exec executable="svnversion" outputproperty="svn.revision">
+        <arg value="."/>
+    </exec>
+    <property name="svn.revision" value="${svn.revision}"/>
+</target>
+
+<target name="revision" description="Creates svn revision label file" 
depends="get_revision">
+
+    <echo message="Replacing version string with ${svn.revision}"/>
+    <replaceregexp file="${version_file}"
+       match="public static final int buildNumber = SVN_REVISION"
+       replace="public static final int buildNumber = ${svn.revision} ;"
+       byline="true"
+    />
+</target>
+
+<!-- ================================================== -->
+
 <target name="mkdir">
     <mkdir dir="${build}"/>
     <mkdir dir="${lib}"/>
 </target>

-<target name="env" depends="mkdir"   description="Learn about the environment">
+<!-- ================================================== -->
+
+<target name="env" depends="mkdir, revision"   description="Learn about the 
environment">
     <available file="${lib}/freenet-ext.jar" property="freenet-ext.present"/>
 </target>

-  <target name="get-extjar" depends="env" unless="freenet-ext.present"
+<!-- ================================================== -->
+
+<target name="get-extjar" depends="env" unless="freenet-ext.present"
     description="Download some external libraries which Freenet relies on">
     <mkdir dir="${lib}"/>
     <get src="http://downloads.freenetproject.org/alpha/freenet-ext.jar"; 
                        dest="${freenet-ext.location}" 
         verbose="true"
         usetimestamp="true"/>
-               <property name="freenet-ext.present" value="true"/>
-  </target>
+    <property name="freenet-ext.present" value="true"/>
+</target>
+
+
+  
     <!-- ================================================== -->
   <target name="compile" depends="get-extjar">
     <!-- Create the time stamp -->

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-08 10:28:58 UTC (rev 
7814)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-08 11:53:57 UTC (rev 
7815)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 335;
+       public static final int buildNumber = SVN_REVISION

        /** Oldest build of Fred we will talk to */
        public static final int lastGoodBuild = 332;