From 8a091e0205cd4777f33dc6fe15022c16a7143bdc Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Sun, 1 Aug 2004 06:46:59 +0000
Subject: [PATCH] fixed for ant 1.5 compat

---
 apps/jetty/build.xml | 7 +++++--
 build.xml            | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 95a79e45d..7dee08b7f 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="all" name="jetty">
-    <available property="jetty.available" file="jettylib" />
         
     <target name="all" depends="build" />
-    <target name="fetchJettylib" unless="jetty.available" >
+    <target name="fetchJettylib" >
+        <available property="jetty.available" file="jettylib" />
+        <ant target="doFetchJettylib" />
+    </target>
+    <target name="doFetchJettylib" unless="jetty.available" >
         <echo message="The libraries contained within the fetched file are from Jetty's 4.2.21 " />
         <echo message="distribution (http://jetty.mortbay.org/) which we have copied to our website since" />
         <echo message="theirs doesn't have direct HTTP access to the libs.  These are not " />
diff --git a/build.xml b/build.xml
index 7253d470d..f0bf88fc6 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="all" name="i2p">
-    <available property="jettylib.available" file="apps/jetty/jettylib" />
     
     <target name="all" >
         <echo message="Useful targets: " />
@@ -118,7 +117,11 @@
     <target name="prepWEB">
         <ant dir="apps/jetty" target="fetchJettylib" />
     </target>
-    <target name="buildWEB" if="jettylib.available">
+    <target name="buildWEB" >
+        <available property="jettylib.available" file="apps/jetty/jettylib" />
+        <ant target="doBuildWEB" />
+    </target>
+    <target name="doBuildWEB" if="jettylib.available">
         <ant dir="apps/routerconsole/java" target="build" />
         <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
         <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />