cleanup and standardize

releng.wtpbuilder/distribution/patches32x.build/build.xml

@@ -38,17 +38,13 @@
         <property
             name="buildTargets"
             value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
 
         <property
             name="dependency.properties"
             value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
 
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
         <ant
             antfile="${buildTargets}">
             <property

releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php

@@ -174,7 +174,7 @@ $mirrorScript=$defaultMirrorScript;
 $downloadprefix=$defaultWTPMirrorPrefix;
 
 
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-sdk-$build.zip";
+$keytestMirrorString=$eclipseMirrorScript . "${eclipseWTPMirrorPrefix}/${build_distribution}-$build.zip";
 if (isMirrored($keytestMirrorString) ) {
 	$mirrorScript=$eclipseMirrorScript;
 	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";