1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
diff -ur freenet-old/build.xml freenet/build.xml
--- freenet-old/build.xml 2008-10-28 21:40:50.000000000 +0100
+++ freenet/build.xml 2008-10-28 21:40:42.000000000 +0100
@@ -16,7 +16,13 @@
<property name="build" location="build"/>
<property name="build-test" location="build-test"/>
<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="je.location" location="${lib}/je.jar"/>
+ <property name="fec.location" location="${lib}/fec.jar"/>
+ <property name="ant.location" location="${lib}/ant.jar"/>
+ <property name="lzma.location" location="${lib}/lzma.jar"/>
+ <property name="lzmajio.location" location="${lib}/lzmajio.jar"/>
+ <property name="mersennetwister.location" location="${lib}/mersennetwister.jar"/>
<property name="javadoc" location="javadoc"/>
<property name="svn.revision" value="@custom@"/>
<property name="CSSTokenizerFilter.relative.jflex" value="freenet/clients/http/filter/CSSTokenizerFilter.jflex"/>
@@ -37,7 +43,6 @@
</target>
<target name="env" depends="mkdir" description="Learn about the environment">
- <available file="${lib}/freenet-ext.jar" property="freenet-ext.present"/>
<available file="${CSSTokenizerFilter.java}" property="CSSTokenizerFilter.present"/>
<available file="${junit.location}" property="junit.present"/>
</target>
@@ -51,19 +56,9 @@
</exec>
</target>
- <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>
-
<!-- ================================================== -->
- <target name="compile" depends="get-extjar, generate-CSSTokenizerFilter">
+ <target name="compile" depends="generate-CSSTokenizerFilter">
<!-- Create the time stamp -->
<tstamp/>
@@ -77,7 +72,13 @@
<javac srcdir="${src}" destdir="${build}" debug="on" optimize="on" source="1.5">
<classpath>
- <pathelement location="${freenet-ext.location}"/>
+ <pathelement location="${wrapper.location}"/>
+ <pathelement location="${je.location}"/>
+ <pathelement location="${fec.location}"/>
+ <pathelement location="${ant.location}"/>
+ <pathelement location="${lzma.location}"/>
+ <pathelement location="${lzmajio.location}"/>
+ <pathelement location="${mersennetwister.location}"/>
<pathelement location="gnu-crypto.jar"/>
<pathelement location="javax-security.jar"/>
<pathelement location="javax-crypto.jar"/>
@@ -135,7 +136,13 @@
<javac srcdir="${test}" destdir="${build-test}" debug="on" optimize="on" source="1.5">
<classpath>
<pathelement path="${build}"/>
- <pathelement location="${freenet-ext.location}"/>
+ <pathelement location="${wrapper.location}"/>
+ <pathelement location="${je.location}"/>
+ <pathelement location="${fec.location}"/>
+ <pathelement location="${ant.location}"/>
+ <pathelement location="${lzma.location}"/>
+ <pathelement location="${lzmajio.location}"/>
+ <pathelement location="${mersennetwister.location}"/>
<pathelement location="${junit.location}"/>
</classpath>
<compilerarg value="-Xlint"/>
@@ -149,7 +156,13 @@
<classpath>
<pathelement path="${build}"/>
<pathelement path="${build-test}"/>
- <pathelement location="${freenet-ext.location}"/>
+ <pathelement location="${wrapper.location}"/>
+ <pathelement location="${je.location}"/>
+ <pathelement location="${fec.location}"/>
+ <pathelement location="${ant.location}"/>
+ <pathelement location="${lzma.location}"/>
+ <pathelement location="${lzmajio.location}"/>
+ <pathelement location="${mersennetwister.location}"/>
<pathelement location="${junit.location}"/>
</classpath>
diff -ur freenet-old/src/freenet/node/NodeStarter.java freenet/src/freenet/node/NodeStarter.java
--- freenet-old/src/freenet/node/NodeStarter.java 2008-10-28 21:40:50.000000000 +0100
+++ freenet/src/freenet/node/NodeStarter.java 2008-10-28 21:39:14.000000000 +0100
@@ -162,37 +162,8 @@
}
private void getExtBuild() {
- try {
- extBuildNumber = ExtVersion.buildNumber;
- extRevisionNumber = ExtVersion.cvsRevision;
- String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber + " r" + extRevisionNumber;
- Logger.normal(this, builtWithMessage);
- System.out.println(builtWithMessage);
- extBuildNumber = ExtVersion.buildNumber();
- if(extBuildNumber == -42) {
- extBuildNumber = ExtVersion.extBuildNumber();
- extRevisionNumber = ExtVersion.extRevisionNumber();
- }
- if(extBuildNumber == 0) {
- String buildMessage = "extBuildNumber is 0; perhaps your freenet-ext.jar file is corrupted?";
- Logger.error(this, buildMessage);
- System.err.println(buildMessage);
- extBuildNumber = -1;
- }
- if(extRevisionNumber == null) {
- String revisionMessage = "extRevisionNumber is null; perhaps your freenet-ext.jar file is corrupted?";
- Logger.error(this, revisionMessage);
- System.err.println(revisionMessage);
- extRevisionNumber = "INVALID";
- }
- } catch(Throwable t) {
- // Compatibility code ... will be removed
- Logger.error(this, "Unable to get the version of your freenet-ext file : it's probably corrupted!");
- System.err.println("Unable to get the version of your freenet-ext file : it's probably corrupted!");
- System.err.println(t.getMessage());
- extRevisionNumber = "INVALID";
- extBuildNumber = -1;
- }
+ extRevisionNumber = "";
+ extBuildNumber = RECOMMENDED_EXT_BUILD_NUMBER;
}
/**
|
GitWeb