synch up and cleanup to add 'datatools' for 155 patches

releng.wtpbuilder/scripts/build/maptasks.xml

@@ -3,9 +3,8 @@
     default="noDefault"
     basedir=".">
 
-    <!-- = = = standard properties pattern = = = -->
-
-    <!-- 
+	<!-- = = = standard properties pattern = = = -->
+    <!--
         Note to be cross-platform, "environment variables" are only appropriate for 
         some variables, e.g. ones we set, since properties are case sensitive, even if 
         the environment variables on your operating system are not, e.g. it will 
@@ -13,7 +12,7 @@
     -->
     <property environment="env" />
 
-    <!-- 
+    <!--
         Let users override standard properties, if desired.
         If directory, file, or some properties do not exist,  
         then standard properties will be used.
@@ -22,124 +21,119 @@
 
 
 
-    <!-- ***  assign repo info -->
+	<!-- ***  assign repo info -->
     <property
         name="mapCvsRoot"
-        value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
-
-
+        value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}"/>
     <echo
         level="info"
-        message="mapCvsRoot: ${mapCvsRoot}" />
-
-
+        message="mapCvsRoot: ${mapCvsRoot}"/>
+    <!--
+        fetchAllMaps is pure convenience. If you are tempted to modify
+        fetchAllMaps, chances are you should just use more specific
+        calls to map util in your own code
+    -->
     <target name="fetchAllMaps">
-
         <ant
             antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
             target="maputil">
             <property
                 name="mapcomponent"
-                value="${env.RELENG}" />
+                value="${env.RELENG}"/>
             <property
                 name="mapTag"
-                value="${mapVersionTag}" />
+                value="${mapVersionTag}"/>
         </ant>
-
         <ant
             antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
             target="maputil">
             <property
                 name="mapcomponent"
-                value="${env.RELENGCOMMON}" />
+                value="${env.RELENGCOMMON}"/>
             <property
                 name="mapTag"
-                value="${mapVersionTag}" />
+                value="${mapVersionTag}"/>
         </ant>
         <ant
             antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
             target="maputil">
             <property
                 name="mapcomponent"
-                value="${env.RELENGSERVERTOOLS}" />
+                value="${env.RELENGSERVERTOOLS}"/>
             <property
                 name="mapTag"
-                value="${mapVersionTag}" />
+                value="${mapVersionTag}"/>
         </ant>
         <ant
             antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
             target="maputil">
             <property
                 name="mapcomponent"
-                value="${env.RELENGSOURCEEDITING}" />
+                value="${env.RELENGSOURCEEDITING}"/>
             <property
                 name="mapTag"
-                value="${mapVersionTag}" />
+                value="${mapVersionTag}"/>
         </ant>
         <ant
             antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
             target="maputil">
             <property
                 name="mapcomponent"
-                value="${env.RELENGWEBSERVICES}" />
+                value="${env.RELENGWEBSERVICES}"/>
             <property
                 name="mapTag"
-                value="${mapVersionTag}" />
+                value="${mapVersionTag}"/>
         </ant>
         <ant
             antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
             target="maputil">
             <property
                 name="mapcomponent"
-                value="${env.RELENGJSF}" />
+                value="${env.RELENGJSF}"/>
             <property
                 name="mapTag"
-                value="${releng.jsf-mapVersionTag}" />
+                value="${releng.jsf-mapVersionTag}"/>
         </ant>
         <ant
             antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
             target="maputil">
             <property
                 name="mapcomponent"
-                value="${env.RELENGDALI}" />
+                value="${env.RELENGDALI}"/>
             <property
                 name="mapTag"
-                value="${releng.dali-mapVersionTag}" />
+                value="${releng.dali-mapVersionTag}"/>
         </ant>
         <ant
             antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
             target="maputil">
             <property
                 name="mapcomponent"
-                value="${env.RELENGEJBTOOLS}" />
+                value="${env.RELENGEJBTOOLS}"/>
             <property
                 name="mapTag"
-                value="${mapVersionTag}" />
+                value="${mapVersionTag}"/>
         </ant>
-
         <ant
             antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
             target="maputil">
             <property
                 name="mapcomponent"
-                value="${env.RELENGJEETOOLS}" />
+                value="${env.RELENGJEETOOLS}"/>
             <property
                 name="mapTag"
-                value="${mapVersionTag}" />
+                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>
-
-      <ant
-          antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-          target="maputil">
-          <property
-              name="mapcomponent"
-              value="${env.RELENGINCUBATOR}" />
-          <property
-              name="mapTag"
-              value="${mapVersionTag}" />
-      </ant>
-    	
-    	
     </target>
 
 
@@ -151,21 +145,21 @@
         <antcall target="checkOutMaps">
             <param
                 name="cvsPackage"
-                value="${mapcomponent}" />
+                value="${mapcomponent}"/>
             <param
                 name="versionTagParam"
-                value="${mapTag}" />
+                value="${mapTag}"/>
         </antcall>
 
         <antcall target="tagMapFiles">
             <param
                 name="cvsPackage"
-                value="${mapcomponent}" />
+                value="${mapcomponent}"/>
         </antcall>
     </target>
 
 
-    <!-- 
+	<!-- 
         Check out the cvsPackage
     -->
     <target
@@ -174,15 +168,15 @@
         unless="mapsLocal">
         <echo
             level="debug"
-            message="mapCvsRoot: ${mapCvsRoot}" />
+            message="mapCvsRoot: ${mapCvsRoot}"/>
         <echo
             level="info"
-            message="cvsPackage = ${cvsPackage} " />
+            message="cvsPackage = ${cvsPackage} "/>
         <echo
             level="info"
-            message="versionTagParam: ${versionTagParam}" />
+            message="versionTagParam: ${versionTagParam}"/>
 
-        <!-- if not set, fail. There are no safe assumptions. -->
+		<!-- if not set, fail. There are no safe assumptions. -->
         <fail unless="mapCvsRoot" />
         <fail unless="cvsPackage" />
         <fail unless="versionTagParam" />
@@ -194,12 +188,10 @@
             dest="${buildDirectory}/maps"
             tag="${versionTagParam}"
             quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}" />
-
-
+            reallyquiet="${env.CVS_REALLY_QUIET}"/>
     </target>
 
-    <!-- 
+	<!-- 
         Tag Map Files mapCvsRoot
     -->
     <target
@@ -211,20 +203,19 @@
             dest="${buildDirectory}/maps/${cvsPackage}"
             command="tag v${buildType}${timestamp}"
             quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}" />
+            reallyquiet="${env.CVS_REALLY_QUIET}"/>
     </target>
 
     <target name="checktagMaps">
         <condition property="tagMaps">
             <equals
                 arg1="${build.donottagmaps}"
-                arg2="false" />
+                arg2="false"/>
         </condition>
         <echo
             level="info"
-            message="tagMaps: ${tagMaps}" />
+            message="tagMaps: ${tagMaps}"/>
     </target>
-
     <target
         name="checkLocal">
         <condition property="mapsLocal">
@@ -232,15 +223,12 @@
         </condition>
         <echo message="mapsLocal: ${mapsLocal}" />
     </target>
-    <!-- 
+	<!-- 
         Default target
     -->
     <target name="noDefault">
         <echo
             level="error"
-            message="You must specify a target when invoking this file" />
+            message="You must specify a target when invoking this file"/>
     </target>
-
-
-
 </project>
\ No newline at end of file