[Bedework-commit] bedework r3173 - in releases/bedework-3.7: build build/buildTools deployutil

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-14 10:21:21 -0500 (Mon, 14 Feb 2011)
New Revision: 3173

Modified:
   releases/bedework-3.7/build/buildTools/deftasks.xml
   releases/bedework-3.7/build/buildTools/getJar.xml
   releases/bedework-3.7/build/buildTools/xjc.xml
   releases/bedework-3.7/build/bw-deployutil-3.7.jar
   releases/bedework-3.7/deployutil/
Log:
Further changes to the build. Attempt to catch changed libraries and force a rebuild.

Also use outofdate to suppress running of apt when sources have not changed.

Minor but widespread change to remove debug parameter from a number of classes. For those debugging now depends on log4j level.

Modified: releases/bedework-3.7/build/buildTools/deftasks.xml
===================================================================
--- releases/bedework-3.7/build/buildTools/deftasks.xml	2011-02-13 04:40:53 UTC (rev 3172)
+++ releases/bedework-3.7/build/buildTools/deftasks.xml	2011-02-14 15:21:21 UTC (rev 3173)
@@ -348,17 +348,49 @@
         </else>
       </if>      
 
+      <!-- See if the libraries are later than any classes --> 
+
+      <var name="org.bedework.libraries.changed" value="false" />
+      
+      <outofdate outputsources="org.bedework,changed.sources">
+        <sourcefiles>
+          <fileset dir="${lib.dir}">
+             <include name="*.jar"/>
+          </fileset>
+          <!-- This makes almost everything rebuild all the time
+               because it has the generated jars for the current package
+          <path refid="compile.classpath"/> 
+          -->
+        </sourcefiles>
+        <targetfiles>
+          <pathelement path="@{jar-file}"/>
+        </targetfiles>
+        <sequential>
+          <var name="org.bedework.libraries.changed" value="true" />
+          <noisyMsg message="**** @{jar-file} needs rebuilding - libraries changed" />
+        </sequential>
+      </outofdate>
+      
+      <noisyMsg message="**** org.bedework,changed.sources = ${org.bedework,changed.sources}" />
+      <noisyMsg message="**** org.bedework.libraries.changed = ${org.bedework.libraries.changed}" />
+
       <if>
-        <uptodate targetfile="@{jar-file}" >
-          <srcfiles refid="buildjar.java.sources" />
-          <srcfiles refid="buildjar.generated.java.sources" />
-          <srcfiles refid="buildjar.resource.files"/>
-          <srcfiles refid="dependency.fileset"/>
-        </uptodate>
+        <and>
+          <not>
+            <equals arg1="${org.bedework.libraries.changed}" arg2="true" />
+          </not>
+          <uptodate targetfile="@{jar-file}" >
+            <srcfiles refid="buildjar.java.sources" />
+            <srcfiles refid="buildjar.generated.java.sources" />
+            <srcfiles refid="buildjar.resource.files"/>
+            <srcfiles refid="dependency.fileset"/>
+          </uptodate>
+        </and>
         <then>
           <noisyMsg message="**** @{jar-file} is up to date" />
         </then>
         <else>
+          <echo message="**** @{jar-file} being rebuilt" />
           <noisyMsg message="**** @{jar-file} needs rebuilding" />
 
           <math result="org.bedework.jars.built" 

Modified: releases/bedework-3.7/build/buildTools/getJar.xml
===================================================================
--- releases/bedework-3.7/build/buildTools/getJar.xml	2011-02-13 04:40:53 UTC (rev 3172)
+++ releases/bedework-3.7/build/buildTools/getJar.xml	2011-02-14 15:21:21 UTC (rev 3173)
@@ -101,7 +101,7 @@
                 <then>
                   <noisyMsg message="Fetch ${org.bedework.getjar.jarname} from project @{project}" />
                   <copy file="${org.bedework.getjar.project.jar}"
-                        todir="@{lib}" overwrite="yes" />
+                        todir="@{lib}" overwrite="yes" preservelastmodified="true" />
                 </then>
               </if>
             </then>
@@ -152,7 +152,7 @@
               </if>
             	
               <copy file="@{libcache}/${org.bedework.getjar.jarname}"
-                    todir="@{lib}" overwrite="yes" />
+                    todir="@{lib}" overwrite="yes" preservelastmodified="true" />
             </else>
           </if>
 

Modified: releases/bedework-3.7/build/buildTools/xjc.xml
===================================================================
--- releases/bedework-3.7/build/buildTools/xjc.xml	2011-02-13 04:40:53 UTC (rev 3172)
+++ releases/bedework-3.7/build/buildTools/xjc.xml	2011-02-14 15:21:21 UTC (rev 3173)
@@ -41,10 +41,10 @@
           </uptodate>
         </and>
         <then>
-          <noisyMsg message="**** @{jar.file} is up to date" />
+          <noisyMsg message="**** @{jar-file} is up to date" />
         </then>
         <else>
-          <noisyMsg message="**** @{jar.file} needs rebuilding" />
+          <noisyMsg message="**** @{jar-file} needs rebuilding" />
 
           <delete dir="${sourcedestdir}" />
           <mkdir dir="${sourcedestdir}" />

Modified: releases/bedework-3.7/build/bw-deployutil-3.7.jar
===================================================================
(Binary files differ)


Property changes on: releases/bedework-3.7/deployutil
___________________________________________________________________
Name: svn:ignore
   + dist