From 979a3e98d8db70e6daf561c4566e5422088aef08 Mon Sep 17 00:00:00 2001
From: complication <complication>
Date: Sun, 2 Dec 2007 03:13:15 +0000
Subject: [PATCH] 2007-12-01 Complication * Separate the checks "does Jetty
.zip file need downloading" and "does Jetty .zip file need extracting"
in the Jetty buildfile. First download (unless already done), then
extract (unless done).
---
apps/jetty/build.xml | 8 ++++++--
history.txt | 7 ++++++-
router/java/src/net/i2p/router/RouterVersion.java | 4 ++--
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 6688f00592..76db0747c2 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -3,15 +3,19 @@
<target name="all" depends="build" />
<target name="fetchJettylib" >
- <available property="jetty.available" file="jetty-5.1.12.zip" />
+ <available property="jetty.zip.available" file="jetty-5.1.12.zip" type="file" />
+ <available property="jetty.zip.extracted" file="jettylib" type="dir" />
<ant target="doFetchJettylib" />
+ <ant target="doExtractJettylib" />
</target>
- <target name="doFetchJettylib" unless="jetty.available" >
+ <target name="doFetchJettylib" unless="jetty.zip.available" >
<echo message="The libraries contained within the fetched file are from Jetty's 5.1.12" />
<echo message="distribution (http://jetty.mortbay.org/). These are not " />
<echo message="necessary for using I2P, but are used by some applications on top of I2P," />
<echo message="such as the routerconsole." />
<get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" verbose="true" dest="jetty-5.1.12.zip" />
+ </target>
+ <target name="doExtractJettylib" unless="jetty.zip.extracted" >
<ant target="doExtract" />
</target>
<target name="doExtract">
diff --git a/history.txt b/history.txt
index 626b6242ed..e870b83f93 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,9 @@
-$Id: history.txt,v 1.597 2007-11-24 15:22:46 zzz Exp $
+$Id: history.txt,v 1.598 2007-11-26 16:54:00 zzz Exp $
+
+2007-12-01 Complication
+ * Separate the checks "does Jetty .zip file need downloading"
+ and "does Jetty .zip file need extracting" in the Jetty buildfile.
+ First download (unless already done), then extract (unless done).
2007-11-26 zzz
* i2psnark: add timeout for receive inactivity
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f23b704475..806fd5df3e 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
- public final static String ID = "$Revision: 1.532 $ $Date: 2007-11-24 15:22:45 $";
+ public final static String ID = "$Revision: 1.533 $ $Date: 2007-11-26 16:53:58 $";
public final static String VERSION = "0.6.1.30";
- public final static long BUILD = 4;
+ public final static long BUILD = 5;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);
--
GitLab