[Bedework-commit] buildTools r5 - trunk

[svnadmin at bedework.org]

Author: douglm
Date: 2008-11-07 11:21:58 -0500 (Fri, 07 Nov 2008)
New Revision: 5

Modified:
   trunk/buildjar.xml
Log:
Set things up so we use a common cache for all quickstart jars

Modified: trunk/buildjar.xml
===================================================================
--- trunk/buildjar.xml	2008-11-07 15:32:14 UTC (rev 4)
+++ trunk/buildjar.xml	2008-11-07 16:21:58 UTC (rev 5)
@@ -36,6 +36,8 @@
 -->
 
 <project name="buildjar" default="build" >
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
   <target name="init">
     <!--  =================== Compilation Control Options ===============
       These properties control option settings on the Javac compiler when it
@@ -84,7 +86,13 @@
       <then>
         <echo message="**** ${build.jar.file} is up to date" />
       </then>
-      <else>
+    </if>
+
+    <if>
+      <not>
+        <isset property="build.jar.uptodate"/>
+      </not>
+      <then>
         <echo message="**** ${build.jar.file} needs rebuilding" />
 
         <!-- Delete jar file -->
@@ -103,6 +111,7 @@
         <mkdir dir="${jar.temp.sources}" />
         <copy toDir="${jar.temp.sources}">
           <fileset refid="base.java.sources" />
+          <fileset refid="base.generated.java.sources" />
           <fileset refid="base.resource.files"/>
         </copy>
 
@@ -140,7 +149,7 @@
 
         <delete dir="${jar.temp.sources}" />
         <delete dir="${jar.temp.classes}"/>
-      </else>
+      </then>
     </if>
   </target>
 </project>