synch up and cleanup for map tasks

releng.wtpbuilder/components/xsl/customTargets.xml

@@ -125,11 +125,16 @@
     -->
     <target name="getMapFiles">
 
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
+      <ant
+          antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
+          target="maputil">
+          <property
+              name="mapcomponent"
+              value="${env.RELENGINCUBATOR}"/>
+          <property
+              name="mapTag"
+              value="${mapVersionTag}"/>
+      </ant>
 
     </target>
 

releng.wtpbuilder/components/xsl_sdk/customTargets.xml

@@ -124,11 +124,16 @@
         -->
     <target name="getMapFiles">
 
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
+      <ant
+          antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
+          target="maputil">
+          <property
+              name="mapcomponent"
+              value="${env.RELENGINCUBATOR}"/>
+          <property
+              name="mapTag"
+              value="${mapVersionTag}"/>
+      </ant>
 
     </target>
 

releng.wtpbuilder/components/xsl_tests/customTargets.xml

@@ -126,11 +126,16 @@
     -->
     <target name="getMapFiles">
 
-        <!-- for now, get all, at once. May componetize later. -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="fetchAllMaps" />
+      <ant
+          antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
+          target="maputil">
+          <property
+              name="mapcomponent"
+              value="${env.RELENGINCUBATOR}"/>
+          <property
+              name="mapTag"
+              value="${mapVersionTag}"/>
+      </ant>
 
     </target>
 

releng.wtpbuilder/distribution/wtp.build/build.xml

@@ -28,7 +28,7 @@
                 name="component"
                 value="common" />
         </ant>
-        --><ant
+        <ant
             antfile="${buildTargets}">
             <property
                 name="component"
@@ -40,7 +40,7 @@
                 name="component"
                 value="xml" />
         </ant>
-        <ant
+        --><ant
             antfile="${buildTargets}">
             <property
                 name="component"
@@ -59,7 +59,7 @@
                 value="dali" />
             <property
                 name="eclipseBuildFailOnError"
-                value="false" />
+                value="true" />
         </ant>
         
         <!-- extender (SDK) versions --><!--
@@ -69,7 +69,7 @@
                 name="component"
                 value="common-sdk" />
         </ant>
-        --><ant
+        <ant
             antfile="${buildTargets}">
             <property
                 name="component"
@@ -81,7 +81,7 @@
                 name="component"
                 value="xml-sdk" />
         </ant>
-        <ant
+        --><ant
             antfile="${buildTargets}">
             <property
                 name="component"
@@ -100,7 +100,7 @@
                 value="dali-sdk" />
             <property
                 name="eclipseBuildFailOnError"
-                value="false" />
+                value="true" />
         </ant>
         
         <!-- JUnit test code --><!--
@@ -113,7 +113,7 @@
                 name="eclipseBuildFailOnError"
                 value="false" />
         </ant>
-        --><ant
+        <ant
             antfile="${buildTargets}">
             <property
                 name="component"
@@ -131,7 +131,7 @@
                 name="eclipseBuildFailOnError"
                 value="false" />
         </ant>
-        <ant
+        --><ant
             antfile="${buildTargets}">
             <property
                 name="component"

releng.wtpbuilder/scripts/build/maptasks.xml

@@ -124,16 +124,7 @@
                 name="mapTag"
                 value="${mapVersionTag}"/>
         </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-            target="maputil">
-            <property
-                name="mapcomponent"
-                value="${env.RELENGINCUBATOR}"/>
-            <property
-                name="mapTag"
-                value="${mapVersionTag}"/>
-        </ant>
+
     </target>