From 8e77c4045c2238cb66c07665eb363517038b0213 Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jdbernard@gmail.com>
Date: Tue, 29 Nov 2011 16:40:55 -0600
Subject: [PATCH] Bug fix in the 'lib' target.

 The 'lib' target was inteded to be a target the project-specific build could
 override. However, the common build was using it to create dependancies on
 '-lib-local' and '-lib-ivy'. If a project-specific build ovverrode lib and
 forgot to add those dependancies it would break. The project-specific builds
 should not be required to know about the internal dependancies of the common
 build. A new target '-lib' was created, which depends on '-lib-local',
 'lic-ivy', and 'lib'. 'lib' is not an empty target that is safe to be
 overridden.
---
 jdb-build-1.8.xml => jdb-build-1.9.xml                    | 8 +++++---
 ...abs.ivysettings-1.8.xml => jdblabs.ivysettings-1.9.xml | 0
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename jdb-build-1.8.xml => jdb-build-1.9.xml (97%)
 rename jdblabs.ivysettings-1.8.xml => jdblabs.ivysettings-1.9.xml (100%)

diff --git a/jdb-build-1.8.xml b/jdb-build-1.9.xml
similarity index 97%
rename from jdb-build-1.8.xml
rename to jdb-build-1.9.xml
index ba43ed0..9f92c4f 100644
--- a/jdb-build-1.8.xml
+++ b/jdb-build-1.9.xml
@@ -61,7 +61,9 @@
     </target>
 
     <!--======== LIBRARY TARGETS ========-->
-    <target name="lib" depends="-lib-local,-lib-ivy"/>
+    <target name="-lib" depends="-lib-local,-lib-ivy,lib"/>
+    
+    <target name="lib"/>
 
     <target name="-init-ivy">
         <ivy:settings id="ivy.settings" file="ivysettings.xml"/>
@@ -112,7 +114,7 @@
     </target>
 
     <!--======== COMPILATION TARGETS ========-->
-    <target name="-compile-groovy" depends="-init,-init-groovy,lib,-lib-groovy">
+    <target name="-compile-groovy" depends="-init,-init-groovy,-lib,-lib-groovy">
         <mkdir dir="${build.dir}/main/classes"/>
         <groovyc srcdir="${src.dir}/main" destdir="${build.dir}/main/classes"
             includeAntRuntime="false">
@@ -125,7 +127,7 @@
         </groovyc>
     </target>
 
-    <target name="-compile-java" depends="-init,lib">
+    <target name="-compile-java" depends="-init,-lib">
         <mkdir dir="${build.dir}/main/classes"/>
         <javac srcdir="${src.dir}/main" destdir="${build.dir}/main/classes"
             includeAntRuntime="false" classpathref="compile-libs"/>
diff --git a/jdblabs.ivysettings-1.8.xml b/jdblabs.ivysettings-1.9.xml
similarity index 100%
rename from jdblabs.ivysettings-1.8.xml
rename to jdblabs.ivysettings-1.9.xml