From be3d736742b36a1a3a95d724fe3a40172436f2da Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 26 Sep 2010 18:33:45 +0000
Subject: [PATCH] cleanup and standardize
---
releng.wtpbuilder/distribution/patches32x.build/build.xml | 8 ++------
.../patches32x.site/templateFiles/buildvariables.php | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/releng.wtpbuilder/distribution/patches32x.build/build.xml b/releng.wtpbuilder/distribution/patches32x.build/build.xml
index 2324911bd..fffefd60b 100644
--- a/releng.wtpbuilder/distribution/patches32x.build/build.xml
+++ b/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
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php
index d4df22282..b26885c3b 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/buildvariables.php
+++ b/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}";
--
GitLab