diff --git a/releng.control/ant_low_priority_helios.sh b/releng.control/ant_low_priority_helios.sh index fc7294c26168fe5ddc96380cf77f57458c5caaec..1ebb4ffee2310bef88e64524556a3e6f8de77878 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 47e7242d48ab37984a5c1d397c746415f091bcc0..dda40faffe5ba71e2460fab4e65ca4b7c4f1b881 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 e78ac747c99a9cb717b9177843fa9366188168e1..695fa38b6713190f8c53d77e1e2dca0ea4a9bc7f 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 a3c30090c1c5c99f589864b82037801a1e6052d3..84a77e5f7bf0aa63677abb7215dee52a3e529088 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 714391b9b0cc7017214a13bae4b57be5f5f2bb13..fb35623a3eb624d08f83b2cb8740a5f65a84117a 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"/>