Changeset 3136

Timestamp:

01/17/11 14:01:45

Author:

douglm

Message:

More changes to the build process to fix up-to-date checks

Files:

• trunk/build.xml (modified) (3 diffs)
• trunk/build/buildTools/deftasks.xml (modified) (5 diffs)
• trunk/build/bw-deployutil-3.7.jar (modified) (previous)

trunk/build.xml

@@ -70 +70 @@
-
-  <deftasks/>
+  
+  <var name="org.bedework.jars.built" value="0" />
+  <var name="org.bedework.jars.checked" value="0" />
-
-  <import file="${build.dir}/buildfilters.xml" />
@@ -193 +196 @@
-  </target>
-
+  <target name="build.deployutil" depends="init"
+          description="builds the deployutil component">
+    <ant antfile="${org.bedework.project.bedework}/deployutil/build.xml" inheritrefs="true"
+           target="build" />
+    
+    <copy todir="${build.dir}" file="${org.bedework.deployutil.jar}" />
+  </target>
+
-  <target name="clean" depends="init,clean.rpiutil,
-                                clean.access,clean.davutil,
@@ -656 +667 @@
-      <property name="build.jar.file" location="${org.bedework.build.jar}" />
-    </ant>
-  </target>
-
-  <target name="build.deployutil" depends="init"
-          description="builds the deployutil component">
-    <ant antfile="${org.bedework.project.bedework}/deployutil/build.xml" inheritrefs="true"
-           target="build" />
-    
-    <copy todir="${build.dir}" file="${org.bedework.deployutil.jar}" />
-  </target>
-

trunk/build/buildTools/deftasks.xml

@@ -184 +184 @@
-          description="Compile access control classes"/>
-  
+  <macrodef name="build-jar-stats">
+    <sequential>
+      <if>
+        <not>
+          <isset property="org.bedework.jars.built" />
+        </not>
+        <then>
+          <echo message="No jars were checked or built" />
+        </then>
+        <else>
+          <echo message="${org.bedework.jars.checked} jars checked: ${org.bedework.jars.built} built" />
+        </else>
+      </if>
+    </sequential>
+  </macrodef>
+  
-  <!-- This macro builds a single jar file. It just sets defaults for the java
-       compiler then invokes it.
@@ -225 +241 @@
-    <attribute name="generated-sources" default=""/>
-    <attribute name="property-resources" default=""/>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      <if>
-        <equals arg1="@{generated-sources}" arg2="" />
@@ -264 +294 @@
-        </not>
-        <then>
-property
+var
-        </then>
-      </if>
@@ -285 +315 @@
-      <property name="compile.listfiles" value="false"/>
-
-property
-    location
-property
-    location
+var
+value
+var
+value
-
-      <!-- ==============================================================
@@ -326 +356 @@
-        <else>
-          <noisyMsg message="**** @{jar-file} needs rebuilding" />
+
+          <math result="org.bedework.jars.built" 
+                operand1="${org.bedework.jars.built}" 
+                operation="+" operand2="1" datatype="int"/>
-
-          <!-- Delete jar file -->