From 7a772bb7a8d380f46dd6ee5b08a93861f7b11632 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 27 Feb 2014 03:59:10 +0000
Subject: [PATCH] Fixed dependency issues, only compile Bote once

---
 botejars/custom_rules.xml | 22 ++++++++++++----------
 custom_rules.xml          |  8 ++++++++
 2 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 custom_rules.xml

diff --git a/botejars/custom_rules.xml b/botejars/custom_rules.xml
index 341b3f2..d33624c 100644
--- a/botejars/custom_rules.xml
+++ b/botejars/custom_rules.xml
@@ -22,7 +22,7 @@
     </fail>
     <echo message="Using I2P-Bote source at ${botebase}" />
 
-    <target name="-pre-compile" depends="copyrouterlibs,buildbote" />
+    <target name="-pre-compile" depends="copyrouterlibs,copybotelibs" />
 
     <!--
          Creates the output directories if they don't exist yet.
@@ -35,7 +35,12 @@
         <mkdir dir="${out.classes.absolute.dir}" />
     </target>
 
-    <target name="-pre-clean" />
+    <target name="-pre-clean">
+        <delete dir="${jar.libs.dir}" verbose="${verbose}" />
+        <ant dir="${botebase}" inheritall="false" useNativeBasedir="true" >
+            <target name="clean" />
+        </ant>
+    </target>
 
     <!-- new rules -->
 
@@ -62,24 +67,21 @@
         <!-- ministreaming -->
         <copy file="${i2plib}/mstreaming.jar" todir="${jar.libs.dir}" />
         <copy file="${i2plib}/streaming.jar" todir="${jar.libs.dir}" />
-
     </target>
 
-    <target name="buildbote" depends="-dirs" >
+    <available property="have.bote" file="${botebase}/WebContent/WEB-INF/lib/i2pbote.jar" />
+
+    <target name="buildbote" unless="have.bote">
         <ant dir="${botebase}" inheritall="false" useNativeBasedir="true" >
             <property name="i2pbase" value="${i2pbase}" />
             <target name="jar" />
         </ant>
+    </target>
 
+    <target name="copybotelibs" depends="-dirs,buildbote">
         <!-- bote -->
         <copy todir="${jar.libs.dir}">
             <fileset dir="${botebase}/WebContent/WEB-INF/lib" />
         </copy>
-
     </target>
-
-    <target name="distclean" depends="clean">
-        <delete dir="${jar.libs.dir}" verbose="${verbose}" />
-    </target>
-
 </project>
diff --git a/custom_rules.xml b/custom_rules.xml
new file mode 100644
index 0000000..3315351
--- /dev/null
+++ b/custom_rules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="imported">
+    <target name="-pre-build" depends="clean">
+        <ant dir="botejars" inheritall="false" useNativeBasedir="true" >
+            <target name="${build.target}" />
+        </ant>
+    </target>
+</project>