Author: nextgens
Date: 2006-05-20 20:41:39 +0000 (Sat, 20 May 2006)
New Revision: 8806
Modified:
trunk/freenet/.classpath
trunk/freenet/build.xml
Log:
Fix the build with the new freenet-ext.jar
Modified: trunk/freenet/.classpath
===================================================================
--- trunk/freenet/.classpath 2006-05-20 20:30:52 UTC (rev 8805)
+++ trunk/freenet/.classpath 2006-05-20 20:41:39 UTC (rev 8806)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry
excluding="freenet/node/*Test.java|org/spaceroots/mantissa/random/MersenneTwisterTest.java|test/**"
kind="src" path="src"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="lib/freenet-ext.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/wrapper.jar"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/freenet/build.xml
===================================================================
--- trunk/freenet/build.xml 2006-05-20 20:30:52 UTC (rev 8805)
+++ trunk/freenet/build.xml 2006-05-20 20:41:39 UTC (rev 8806)
@@ -12,7 +12,6 @@
<property name="build" location="build"/>
<property name="lib" location="lib"/>
<property name="freenet-ext.location" location="${lib}/freenet-ext.jar"/>
- <property name="wrapper.location" location="${lib}/wrapper.jar"/>
<property name="javadoc" location="javadoc"/>
<property name="svn.revision" value="@custom@"/>
@@ -24,7 +23,6 @@
<target name="env" depends="mkdir" description="Learn about the
environment">
<available file="${lib}/freenet-ext.jar" property="freenet-ext.present"/>
- <available file="${lib}/wrapper.jar" property="wrapper.present"/>
</target>
<target name="get-extjar" depends="env" unless="freenet-ext.present"
@@ -37,18 +35,8 @@
<property name="freenet-ext.present" value="true"/>
</target>
- <target name="get-wrapper" depends="env" unless="wrapper.present"
- description="Download some external libraries which Freenet
relies on">
- <mkdir dir="${lib}"/>
- <get src="http://downloads.freenetproject.org/alpha/wrapper.jar";
- dest="${wrapper.location}"
- verbose="true"
- usetimestamp="true"/>
- <property name="wrapper.present" value="true"/>
- </target>
-
<!-- ================================================== -->
- <target name="compile" depends="get-extjar, get-wrapper">
+ <target name="compile" depends="get-extjar">
<!-- Create the time stamp -->
<tstamp/>
@@ -64,7 +52,6 @@
<javac srcdir="${src}" destdir="${build}" debug="on" optimize="on"
source="1.4">
<classpath>
<pathelement location="${freenet-ext.location}"/>
- <pathelement location="${wrapper.location}"/>
<pathelement location="gnu-crypto.jar"/>
<pathelement location="javax-security.jar"/>
<pathelement location="javax-crypto.jar"/>
