Author: nextgens
Date: 2006-01-09 13:04:17 +0000 (Mon, 09 Jan 2006)
New Revision: 7826
Modified:
trunk/freenet/build.xml
trunk/freenet/src/freenet/node/Version.java
Log:
13:00 <@toad_> but what you committed is COMPLETELY UNUSABLE
okok :) I revert
Modified: trunk/freenet/build.xml
===================================================================
--- trunk/freenet/build.xml 2006-01-09 12:49:01 UTC (rev 7825)
+++ trunk/freenet/build.xml 2006-01-09 13:04:17 UTC (rev 7826)
@@ -9,59 +9,30 @@
<!-- 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" depends="revert_version">
- <exec executable="svnversion" outputproperty="svn.revision">
- <arg value="."/>
- </exec>
- <property name="svn.revision" value="${svn.revision}"/>
- <echo message="Revision: ${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 =[0-9\ ]+;"
- 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, revision, get-extjar" description="Learn
about the environment">
+<target name="env" depends="mkdir" description="Learn about the environment">
<available file="${lib}/freenet-ext.jar" property="freenet-ext.present"/>
</target>
-<!-- ================================================== -->
-
-<target name="get-extjar" depends="mkdir" 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="env">
+ <target name="compile" depends="get-extjar">
<!-- Create the time stamp -->
<tstamp/>
<!-- Create the build directory structure used by compile -->
@@ -107,16 +78,10 @@
<delete dir="${build}"/>
<!--<delete><fileset dir="src" includes="**/*.class"/></delete>-->
</target>
- <target name="distclean" description="Delete class files and docs dir."
depends="revert_version">
+ <target name="distclean" description="Delete class files and docs dir.">
<delete dir="${build}"/>
<delete dir="${lib}"/>
-
<!--<delete><fileset dir="src" includes="**/*.class"/></delete>-->
</target>
- <target name="revert_version" description="Revert
src/freenet/node/Version.java.">
- <exec executable="svn">
- <arg value="revert"/>
- <arg value="src/freenet/node/Version.java"/>
- </exec>
- </target>
+
</project>
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-09 12:49:01 UTC (rev
7825)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-09 13:04:17 UTC (rev
7826)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 0 ;
+ public static final int buildNumber = 335;
/** Oldest build of Fred we will talk to */
public static final int lastGoodBuild = 332;
