Author: nextgens
Date: 2008-10-29 21:16:24 +0000 (Wed, 29 Oct 2008)
New Revision: 23199
Modified:
trunk/contrib/freenet_ext/ExtVersion.java
trunk/contrib/freenet_ext/build.xml
Log:
freenet-ext: more cleanup to the build-script
Modified: trunk/contrib/freenet_ext/ExtVersion.java
===================================================================
--- trunk/contrib/freenet_ext/ExtVersion.java 2008-10-29 21:00:00 UTC (rev
23198)
+++ trunk/contrib/freenet_ext/ExtVersion.java 2008-10-29 21:16:24 UTC (rev
23199)
@@ -17,7 +17,7 @@
}
/** Revision number of ExtVersion.java as read from SVN */
- public static final String cvsRevision = "23149"; // This is the
freenet-ext.jar revision the node was built with
+ public static final String cvsRevision = "@custom@"; // This is the
freenet-ext.jar revision the node was built with
public static final String cvsRevision() { // This method is here for
backwards compatability with a few node testing builds between 999 and 1000
return cvsRevision;
Modified: trunk/contrib/freenet_ext/build.xml
===================================================================
--- trunk/contrib/freenet_ext/build.xml 2008-10-29 21:00:00 UTC (rev 23198)
+++ trunk/contrib/freenet_ext/build.xml 2008-10-29 21:16:24 UTC (rev 23199)
@@ -124,9 +124,9 @@
<delete dir="${build}-test"/>
</target>
- <target name="clean" depends="distclean"/>
-
- <target name="distclean" description="Cleanup the build directory">
+ <target name="clean" description="Cleanup the build directory">
+ <delete file="${jar.location}"/>
+ <delete dir="${build}"/>
<ant antfile="build.xml" target="clean" dir="../fec/common/"/>
<ant antfile="build.xml" target="clean" dir="../bdb/"/>
<ant antfile="build.xml" target="clean" dir="../wrapper/">
@@ -134,16 +134,14 @@
<property name="bits" value="32"/>
</ant>
<ant antfile="build.xml" target="clean" dir="../db4o/"/>
- <delete dir="${build}"/>
- <delete file="${jar.location}"/>
</target>
<target name="jar"
depends="clean,fec,jcpuid,nativethread,bigint,bdb,wrapper,db4o,build-java"
description="Create the jar file">
+ <delete file="${jar.location}"/>
<jar jarfile="${jar.location}" basedir="${build}" includes="**"
update="yes" duplicate="fail" level="9">
<zipfileset src="../fec/common/lib/onion-common.jar"/>
<zipfileset src="../bdb/build/lib/je.jar"/>
<zipfileset src="../wrapper/lib/wrapper.jar"/>
- <zipfileset src="../db4o/db4o.jar"/>
</jar>
</target>
</project>
