[Bedework-commit] bedework r3211 - releases/bedework-3.7/build/buildTools

[svnadmin at bedework.org]

Author: douglm
Date: 2011-03-07 11:07:46 -0500 (Mon, 07 Mar 2011)
New Revision: 3211

Modified:
   releases/bedework-3.7/build/buildTools/wsimport.xml
   releases/bedework-3.7/build/buildTools/xjc.xml
Log:
Add more dependency checking to schema rebuild. Maybe we won't need "clean" so often.

Modified: releases/bedework-3.7/build/buildTools/wsimport.xml
===================================================================
--- releases/bedework-3.7/build/buildTools/wsimport.xml	2011-03-05 14:27:01 UTC (rev 3210)
+++ releases/bedework-3.7/build/buildTools/wsimport.xml	2011-03-07 16:07:46 UTC (rev 3211)
@@ -27,6 +27,7 @@
     <attribute name="module-base"/>
     <attribute name="jar-file"/>
     <attribute name="bindingsdir" default="" />
+    <attribute name="dependencies" default="empty.fileset" />
     <sequential>
       <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
       
@@ -34,14 +35,28 @@
       
       <dirname property="org.bedework.wsdl.dir" file="@{wsdl}"/>
 
+      <var name="org.bedework.source.changed" value="false" />
+      
+      <outofdate outputsources="org.bedework,changed.sources">
+        <sourcefiles>
+          <fileset dir="${org.bedework.wsdl.dir}"/>
+          <fileset refid="@{dependencies}"/>
+        </sourcefiles>
+        <targetfiles>
+          <pathelement path="@{jar-file}"/>
+        </targetfiles>
+        <sequential>
+          <var name="org.bedework.source.changed" value="true" />
+        </sequential>
+      </outofdate>
+      
+      <noisyMsg message="**** org.bedework,changed.sources = ${org.bedework,changed.sources}" />
+      <noisyMsg message="**** org.bedework.source.changed = ${org.bedework.source.changed}" />
+
       <if>
-        <and>
-          <available file="${sourcedestdir}" type="dir" />
-          <uptodate property="org.bedework.wsimport.uptodate"
-                    targetfile="@{jar-file}" >
-            <srcfiles dir="${org.bedework.wsdl.dir}" />
-          </uptodate>
-        </and>
+        <not>
+          <equals arg1="${org.bedework.source.changed}" arg2="true" />
+        </not>
         <then>
           <noisyMsg message="**** @{jar.file} is up to date" />
         </then>

Modified: releases/bedework-3.7/build/buildTools/xjc.xml
===================================================================
--- releases/bedework-3.7/build/buildTools/xjc.xml	2011-03-05 14:27:01 UTC (rev 3210)
+++ releases/bedework-3.7/build/buildTools/xjc.xml	2011-03-07 16:07:46 UTC (rev 3211)
@@ -26,6 +26,7 @@
     <attribute name="module-base"/>
     <attribute name="jar-file"/>
     <attribute name="bindingsdir" default="" />
+    <attribute name="dependencies" default="empty.fileset" />
     <sequential>
       <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
       
@@ -33,13 +34,28 @@
       
       <dirname property="org.bedework.schema.dir" file="@{schema}"/>
 
+      <var name="org.bedework.source.changed" value="false" />
+      
+      <outofdate outputsources="org.bedework,changed.sources">
+        <sourcefiles>
+          <fileset dir="${org.bedework.schema.dir}"/>
+          <fileset refid="@{dependencies}"/>
+        </sourcefiles>
+        <targetfiles>
+          <pathelement path="@{jar-file}"/>
+        </targetfiles>
+        <sequential>
+          <var name="org.bedework.source.changed" value="true" />
+        </sequential>
+      </outofdate>
+      
+      <noisyMsg message="**** org.bedework,changed.sources = ${org.bedework,changed.sources}" />
+      <noisyMsg message="**** org.bedework.source.changed = ${org.bedework.source.changed}" />
+
       <if>
-        <and>
-          <available file="${sourcedestdir}" type="dir" />
-          <uptodate targetfile="@{jar-file}" >
-            <srcfiles dir="${org.bedework.schema.dir}" />
-          </uptodate>
-        </and>
+        <not>
+          <equals arg1="${org.bedework.source.changed}" arg2="true" />
+        </not>
         <then>
           <noisyMsg message="**** @{jar-file} is up to date" />
         </then>