From 400ac7773ae0f8358f6fffbb9c969723971bc3e1 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 3 Aug 2009 16:52:32 +0000
Subject: [PATCH] 285383 need a Helios build stream
---
releng.control/ant_low_priority_helios.sh | 2 +-
releng.wtpbuilder/distribution/wtp.build/build.xml | 2 +-
releng.wtpbuilder/distribution/wtp.site/publish.xml | 4 ++--
releng.wtpbuilder/distribution/wtp.tests/build.xml | 2 +-
releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/releng.control/ant_low_priority_helios.sh b/releng.control/ant_low_priority_helios.sh
index fc7294c26..1ebb4ffee 100644
--- a/releng.control/ant_low_priority_helios.sh
+++ b/releng.control/ant_low_priority_helios.sh
@@ -19,7 +19,7 @@ then
popd
fi
-export DEP_DIR=helios
+export DEP_DIR=/helios
echo "Running ant at priority +3"
exec nice --adjustment 10 "${RELENG_CONTROL}/ant.sh" "$@"
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index 47e7242d4..dda40faff 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -37,7 +37,7 @@
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index e78ac747c..695fa38b6 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -92,7 +92,7 @@
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -203,7 +203,7 @@
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
<property
file="${dependencies.properties}"/>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index a3c30090c..84a77e5f7 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -100,7 +100,7 @@
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
<property
name="base.install.dir"
value="${testRoot}"/>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
index 714391b9b..fb35623a3 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
@@ -50,11 +50,11 @@
-->
<property name="env.DEP_DIR" value="" />
<fail
- message="Required file does not exist: ${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties">
+ message="Required file does not exist: ${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties">
<condition>
<not>
<available
- file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
</not>
</condition>
</fail>
@@ -62,7 +62,7 @@
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
<antcall
target="getDependencies"/>
--
GitLab