diff --git a/releng.control/ant_high_priority_galileo.sh b/releng.control/ant_high_priority.sh
similarity index 86%
rename from releng.control/ant_high_priority_galileo.sh
rename to releng.control/ant_high_priority.sh
index cb97923dc1691486e4b3f606d741afc215438620..88aeffcbf33c7bfa338483556ac5458a06580834 100644
--- a/releng.control/ant_high_priority_galileo.sh
+++ b/releng.control/ant_high_priority.sh
@@ -19,8 +19,5 @@ then
popd
fi
-# directory under releng for maps/dependencies.properties
-export DEP_DIR=/galileo
-echo "DEP_DIR: " $DEP_DIR
echo "Running ant at priority " $JOB_NOT_NICE
exec nice --adjustment $JOB_NOT_NICE "${RELENG_CONTROL}/ant.sh" "$@"
diff --git a/releng.control/ant_high_priority_helios.sh b/releng.control/ant_high_priority_helios.sh
deleted file mode 100644
index a3588a327f272eda8628531a137c5c3b89bd1f3a..0000000000000000000000000000000000000000
--- a/releng.control/ant_high_priority_helios.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-#
-# remember to leave no slashes on commonVariations in source command,
-# so that users path is used to find it (first). But, path on
-# commonComputedVariables means we expect to execute only our
-# version
-
-if [ -z $BUILD_INITIALIZED ]
-then
-# if releng_control not set, we assume we are already in releng_control directory
- if [ -z $RELENG_CONTROL ]
- then
- RELENG_CONROL=`pwd`
- fi
- pushd .
- cd ${RELENG_CONTROL}
- source commonVariations.shsource
- source ${RELENG_CONTROL}/commonComputedVariables.shsource
- popd
-fi
-
-# directory under releng for maps/dependencies.properties
-export DEP_DIR=/helios
-echo "DEP_DIR: " $DEP_DIR
-echo "Running ant at priority " $JOB_NOT_NICE
-exec nice --adjustment $JOB_NICER "${RELENG_CONTROL}/ant.sh" "$@"
diff --git a/releng.control/ant_low_priority_galileo.sh b/releng.control/ant_low_priority_galileo.sh
deleted file mode 100644
index f0bacfb1f6860fc018f426634be8146b1aa8cef1..0000000000000000000000000000000000000000
--- a/releng.control/ant_low_priority_galileo.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-#
-# remember to leave no slashes on commonVariations in source command,
-# so that users path is used to find it (first). But, path on
-# commonComputedVariables means we expect to execute only our
-# version
-
-if [ -z $BUILD_INITIALIZED ]
-then
-# if releng_control not set, we assume we are already in releng_control directory
- if [ -z $RELENG_CONTROL ]
- then
- RELENG_CONROL=`pwd`
- fi
- pushd .
- cd ${RELENG_CONTROL}
- source commonVariations.shsource
- source ${RELENG_CONTROL}/commonComputedVariables.shsource
- popd
-fi
-
-# directory under releng for maps/dependencies.properties
-export DEP_DIR=/galileo
-echo "DEP_DIR: " $DEP_DIR
-echo "Running ant at priority " $JOB_NICER
-exec nice --adjustment $JOB_NICER "${RELENG_CONTROL}/ant.sh" "$@"
diff --git a/releng.control/ant_low_priority_helios.sh b/releng.control/ant_low_priority_helios.sh
deleted file mode 100644
index 556a76ec1c3183dcc2f5b34ac74cec054366e503..0000000000000000000000000000000000000000
--- a/releng.control/ant_low_priority_helios.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-#
-# remember to leave no slashes on commonVariations in source command,
-# so that users path is used to find it (first). But, path on
-# commonComputedVariables means we expect to execute only our
-# version
-
-if [ -z $BUILD_INITIALIZED ]
-then
-# if releng_control not set, we assume we are already in releng_control directory
- if [ -z $RELENG_CONTROL ]
- then
- RELENG_CONROL=`pwd`
- fi
- pushd .
- cd ${RELENG_CONTROL}
- source commonVariations.shsource
- source ${RELENG_CONTROL}/commonComputedVariables.shsource
- popd
-fi
-
-# directory under releng for maps/dependencies.properties
-export DEP_DIR=/helios
-echo "DEP_DIR: " $DEP_DIR
-echo "Running ant at priority " $JOB_NICER
-exec nice --adjustment $JOB_NICER "${RELENG_CONTROL}/ant.sh" "$@"
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 21165e1dfdecd0a9372ce8a7ae14fa98f39de8f5..be16c9e62ecdeeb81afc90e96ffead42fdc91df1 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -37,7 +37,7 @@
value="18000"/>
<property
name="time.twelveHours"
- value="43200"/>
+ value="43200"/>
<property
name="time.twentyFourHours"
value="86400"/>
@@ -60,7 +60,7 @@
-->
<plugin
name="ant"
- antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh"
+ antscript="${env.RELENG_CONTROL}/ant_low_priority.sh"
buildfile="${env.RELENG_CONTROL}/cc_project_build.xml"
target="Build"
uselogger="${env.USE_LOGGER}"
@@ -191,6 +191,12 @@
<schedule
interval="${time.veryLongTime}">
<ant>
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="I"/>
@@ -223,6 +229,12 @@
<schedule
interval="${time.oneHour}">
<ant>
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="I"/>
@@ -266,6 +278,12 @@
<schedule
interval="${time.oneHour}">
<ant>
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="I"/>
@@ -296,7 +314,14 @@
</modificationset>
<schedule
interval="${time.oneHour}">
+
<ant>
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/testdependency.xml"/>
<property
name="buildId"
value="3.3.0"/>
@@ -329,6 +354,12 @@
<schedule
interval="${time.oneHour}">
<ant>
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="I"/>
@@ -367,6 +398,12 @@
<schedule
interval="${time.oneHour}">
<ant>
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/jsdttestdependency.xml"/>
<property
name="buildType"
value="I"/>
@@ -409,6 +446,12 @@
<schedule
interval="${time.oneHour}">
<ant>
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/jsdttestdependency.xml"/>
<property
name="buildType"
value="M"/>
@@ -420,7 +463,7 @@
value="1.2.1"/>
<property
name="mapVersionTag"
- value="R3_2_maintenance"/>
+ value="R3_2_maintenance"/>
<property
name="releng.jsdt-mapVersionTag"
value="R3_2_maintenance"/>
@@ -440,7 +483,7 @@
</ant>
</schedule>
</project>
-
+
<project
forceOnly="true"
forceBuildNewProject="false"
@@ -623,7 +666,13 @@
<schedule
interval="${time.veryLongTime}">
<ant
- antscript="${env.RELENG_CONTROL}/ant_high_priority_helios.sh">
+ antscript="${env.RELENG_CONTROL}/ant_high_priority.sh">
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/testdependency.xml"/>
<property
name="passBuildEvenIfFailedTests"
value="true"/>
@@ -645,12 +694,12 @@
<property
name="releng.jsf-mapVersionTag"
value="R3_2_1_patches"/>
-
+
<property
name="releng.jsdt-mapVersionTag"
value="R3_2_1_patches"/>
-
+
<property
name="build.distribution"
value="patches32x"/>
@@ -677,7 +726,7 @@
</htmlemail>
</publishers>
</project>
- <project
+ <project
forceOnly="true"
forceBuildNewProject="false"
requireModification="true"
@@ -689,7 +738,13 @@
<schedule
interval="${time.veryLongTime}">
<ant
- antscript="${env.RELENG_CONTROL}/ant_high_priority_galileo.sh">
+ antscript="${env.RELENG_CONTROL}/ant_high_priority.sh">
+ <property
+ name="dependencyFileLocation"
+ value="galileo/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="galileo/maps/testdependency.xml"/>
<property
name="passBuildEvenIfFailedTests"
value="true"/>
@@ -736,9 +791,9 @@
file=""/>
</htmlemail>
</publishers>
- </project>
-
- <project
+ </project>
+
+ <project
forceOnly="false"
requireModification="true"
name="wtp-R3.2.2-M">
@@ -784,7 +839,13 @@
<schedule
interval="${time.oneHour}">
<ant
- antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh">
+ antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="M"/>
@@ -805,17 +866,17 @@
value="R3_2_maintenance"/>
<property
name="releng.jsdt-mapVersionTag"
- value="R3_2_maintenance"/>
-
+ value="R3_2_maintenance"/>
+
<property
name="build.distribution"
value="wtp"/>
</ant>
</schedule>
</project>
-
-
-
+
+
+
<project
forceOnly="false"
requireModification="true"
@@ -853,7 +914,13 @@
<schedule
interval="${time.oneHour}">
<ant
- antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh">
+ antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="S"/>
@@ -875,7 +942,7 @@
<property
name="releng.jsdt-mapVersionTag"
value="HEAD"/>
-
+
<property
name="build.distribution"
value="wtp"/>
@@ -919,7 +986,13 @@
<schedule
interval="${time.fourHours}">
<ant
- antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh">
+ antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="I"/>
@@ -968,7 +1041,13 @@
<schedule
interval="${time.veryLongTime}">
<ant
- antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh">
+ antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
+ <property
+ name="dependencyFileLocation"
+ value="helios/maps/dependencies.properties"/>
+ <property
+ name="testdependencyFileLocation"
+ value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="N"/>
@@ -990,7 +1069,7 @@
value="HEAD"/>
<property
name="releng.jsdt-mapVersionTag"
- value="HEAD"/>
+ value="HEAD"/>
<property
name="build.distribution"
value="wtp"/>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
index c58c1a1db44ae1829e17d6d0aaa41cdcbb0fbb3b..782961be5a5185530a03b002e95f467719816402 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
index 478166a6b01f8012a31cbef96d1a150b814da3f2..d0314f60ad7d8e7b2d07d0354c774510d6dac4a6 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index e7aa7c4fa257dd60b97592e15a1a10dd5cfb44bc..11232534923ce008a82243141adb8ae20b82d535 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -83,16 +83,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -242,7 +236,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/components/common-sdk/customTargets.xml b/releng.wtpbuilder/components/common-sdk/customTargets.xml
index fdb160e3db322eb22bf0bea36b5ec52c24457273..a62d79a2c69ccf01565d4f249830d8c3b3fd2f8c 100644
--- a/releng.wtpbuilder/components/common-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/common-sdk/customTargets.xml
@@ -144,7 +144,7 @@
target="get">
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
diff --git a/releng.wtpbuilder/components/common.tests/customTargets.xml b/releng.wtpbuilder/components/common.tests/customTargets.xml
index f3495985f28fa425cc00f3f3ea82973f0d8777c2..a71729238e7bfd47e3eafd96075d9bb0501284c5 100644
--- a/releng.wtpbuilder/components/common.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/common.tests/customTargets.xml
@@ -146,7 +146,7 @@
target="get">
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
diff --git a/releng.wtpbuilder/components/common/customTargets.xml b/releng.wtpbuilder/components/common/customTargets.xml
index edf82cd333fb7c6814bbaaa8694d79b702f61de3..7307a91360655c55bddbabc9a57baca34626d73e 100644
--- a/releng.wtpbuilder/components/common/customTargets.xml
+++ b/releng.wtpbuilder/components/common/customTargets.xml
@@ -145,7 +145,7 @@
target="get">
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
diff --git a/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
index 035d713913e28265a8bab4ea902dfd533bc63925..50200ad28fcc3a9c67331b956f534ce97d20193a 100644
--- a/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
@@ -150,14 +150,10 @@
<ant
antfile="${component.dir}/dependency.xml"
target="get">
-
- <property
- name="env.DEP_DIR"
- value=""/>
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
diff --git a/releng.wtpbuilder/components/wtp-patches2-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches2-tests/customTargets.xml
index d01fd61d8bed59da6cff8ef0a7737493c8cbb450..a797918f830f1565145938d201b477a5ed5ca35a 100644
--- a/releng.wtpbuilder/components/wtp-patches2-tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches2-tests/customTargets.xml
@@ -152,7 +152,7 @@
target="get">
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
diff --git a/releng.wtpbuilder/components/wtp-patches2/customTargets.xml b/releng.wtpbuilder/components/wtp-patches2/customTargets.xml
index ae1d0ea3ef20e96e57a9975ca2810e8a9228f12a..dbda1935d0e2589c59f605c353d2c22509b67e64 100644
--- a/releng.wtpbuilder/components/wtp-patches2/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches2/customTargets.xml
@@ -146,7 +146,7 @@
target="get">
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
diff --git a/releng.wtpbuilder/components/wtp-patches3-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches3-tests/customTargets.xml
index 8c1428060dbba489aea42375c220d498f5f82531..49134fd8524798304104654b788691ef275aee7f 100644
--- a/releng.wtpbuilder/components/wtp-patches3-tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches3-tests/customTargets.xml
@@ -151,13 +151,10 @@
antfile="${component.dir}/dependency.xml"
target="get">
- <property
- name="env.DEP_DIR"
- value=""/>
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index e23bcb3d443746c6478c4eccdf98929667075a88..40e3e9cb0c62dad1ff8a25e18fb0d773c2975b4e 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -229,7 +229,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/jaxws.build/build.xml b/releng.wtpbuilder/distribution/jaxws.build/build.xml
index 904876f76870efe5581bc63a44a11dcbc0cb09ff..fd6c7a56d9487ce050ece592deb481968c394410 100644
--- a/releng.wtpbuilder/distribution/jaxws.build/build.xml
+++ b/releng.wtpbuilder/distribution/jaxws.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/jaxws.site/build.xml b/releng.wtpbuilder/distribution/jaxws.site/build.xml
index 195353b38d00e1b650750114a128587ace5c0e27..0c74840fe9a5377149c7dfbe7025fef57c33b8fa 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/build.xml
+++ b/releng.wtpbuilder/distribution/jaxws.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/jaxws.site/publish.xml b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/build.xml b/releng.wtpbuilder/distribution/jaxws.tests/build.xml
index efed284927190d207f22b0f95df93bfef3c180b6..feee151d00ea41a2a7a3ba67e284b9adf6b68964 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/build.xml
@@ -83,16 +83,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -242,7 +236,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/jsdt.build/build.xml b/releng.wtpbuilder/distribution/jsdt.build/build.xml
index 081d16181d740c965c0df9b70fd2aa020237a183..d15c0898e3e3974efd6c861dcbe1581fd7bd913c 100644
--- a/releng.wtpbuilder/distribution/jsdt.build/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/jsdt.site/build.xml b/releng.wtpbuilder/distribution/jsdt.site/build.xml
index 24dc2530e9c62483f856b53302d1032626eb7f62..c8e89fe5c318e699b9f7b008f5abe36faa1cc341 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/jsdt.site/publish.xml b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
index a5f6fe1d7223d99111b4b9ad7e6823e7e529b497..bbc05803e958cb2f38018705b04c3b29528a5f98 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
@@ -87,7 +87,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -192,7 +192,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index aeeee0d381267655859c3db64b079f0b5da780db..b1c565b35f050a9c1999049c8cf8e79698373ee4 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -83,16 +83,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -101,7 +95,7 @@
unless="dependency.properties.exists"/>
<property
name="test.dependency"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/jsdttestdependency.xml"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${testdependencyFileLocation}"/>
<available
file="${test.dependency}"
property="test.dependency.exists"/>
@@ -251,7 +245,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches.build/build.xml b/releng.wtpbuilder/distribution/patches.build/build.xml
index 62ae6abee002886e499d23920e9f560f543e9c37..db11355bd34f5eab55f84a79963533b5e60e6339 100644
--- a/releng.wtpbuilder/distribution/patches.build/build.xml
+++ b/releng.wtpbuilder/distribution/patches.build/build.xml
@@ -28,16 +28,10 @@
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <!--
- if not otherwise set, assume its a legacy case that did not
- use this
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/patches.site/build.xml b/releng.wtpbuilder/distribution/patches.site/build.xml
index 4748e657de08e01524c85a7e14d42aa22dc18e20..78b260cb8436e67bfb0d98add4e6ef9b9b424a4d 100644
--- a/releng.wtpbuilder/distribution/patches.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches.site/build.xml
@@ -39,7 +39,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches.site/publish.xml b/releng.wtpbuilder/distribution/patches.site/publish.xml
index 8e0417b397f39ef060d20980e07efe6c06d66882..2c6e98cd7441eccf6bcae199bf8867c5898a77d3 100644
--- a/releng.wtpbuilder/distribution/patches.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches.site/publish.xml
@@ -49,39 +49,9 @@
</target>
<target
name="generateCompileIndex">
- <!--
- <taskdef name="indexResults"
- classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
- />
- -->
- <!--
- isBuildTested: true|false should JUnit plugin test results
- be used to generate index page dropTokenList: comma
- separated list of strings which should be replaced by the
- fileName attribute settings in the testManifest.xml.
- xmlDirectoryName: path to directory containing JUnit plugin
- test results in xml format (see doc is org.eclipse.test).
- dropDirectoryName: path to directory containing the result
- of the build. testResultsTemplateFileName: path to template
- file used to generate page with links to JUnit test results
- testResultsHtmlFileName: name of file which will be
- generated with links to JUnit test results dropHtmlFileName:
- name of generated index page hrefTestResultsTargetPath:
- relative path from index page to directory containing JUnit
- html test results hrefCompileLogsTargetPath: relative path
- from index page directory containing compilelogs
- testManifestFileName: name of xml file containing
- descriptions of zip types and log files
- -->
- <!--
- if not otherwise set, assume its a legacy case that did not
- use this
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<summarizeResults
@@ -163,15 +133,9 @@
testManifestFileName: name of xml file containing
descriptions of zip types and log files
-->
- <!--
- if not otherwise set, assume its a legacy case that did not
- use this
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/patches.tests/build.xml b/releng.wtpbuilder/distribution/patches.tests/build.xml
index aea274fad88b69946e1361bf65eac89e6b35536c..e647ddea5d3092cc68df55f7c080df30a84ada4b 100644
--- a/releng.wtpbuilder/distribution/patches.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/build.xml
@@ -80,16 +80,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -220,7 +214,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches2.site/publish.xml b/releng.wtpbuilder/distribution/patches2.site/publish.xml
index 95bdf2e2a8ec4175a843b5d60e0c575a8d849822..fc005bfa0080ff997ba3ace14204b8e4288f7525 100644
--- a/releng.wtpbuilder/distribution/patches2.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches2.site/publish.xml
@@ -73,7 +73,7 @@
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<!-- create tables of test plugin compiles first -->
<summarizeResults
@@ -154,7 +154,7 @@
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/patches2.tests/build.xml b/releng.wtpbuilder/distribution/patches2.tests/build.xml
index 5c79d0173f34442916816fcc5d36cf43d58d90dd..17ba00118ea6f951c89bc5efa07efd84f06c8897 100644
--- a/releng.wtpbuilder/distribution/patches2.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches2.tests/build.xml
@@ -76,7 +76,7 @@
target="get">
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<property
name="base.install.dir"
value="${testRoot}"/>
@@ -226,7 +226,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches2.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/patches2.tests/standaloneTest.xml
index 3ee1693573d91e26f57e81da9d8ca212139201f2..b82487a83325ae5270a987179ed32e3dabb15e82 100644
--- a/releng.wtpbuilder/distribution/patches2.tests/standaloneTest.xml
+++ b/releng.wtpbuilder/distribution/patches2.tests/standaloneTest.xml
@@ -26,7 +26,7 @@
<antcall
target="getReleng"/>
<property
- file="${testRoot}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${testRoot}/${env.RELENG}/${dependencyFileLocation}"/>
<antcall
target="getDependencies"/>
<condition
diff --git a/releng.wtpbuilder/distribution/patches3.build/build.xml b/releng.wtpbuilder/distribution/patches3.build/build.xml
index 11e7ff078fd4bbcef67458d87324542a789e27cf..fec015120c11aa240eeafd75fb026d70d8f4c55e 100644
--- a/releng.wtpbuilder/distribution/patches3.build/build.xml
+++ b/releng.wtpbuilder/distribution/patches3.build/build.xml
@@ -28,16 +28,10 @@
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <!--
- if not otherwise set, assume its a legacy case that did not
- use this
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/patches3.site/build.xml b/releng.wtpbuilder/distribution/patches3.site/build.xml
index 4748e657de08e01524c85a7e14d42aa22dc18e20..78b260cb8436e67bfb0d98add4e6ef9b9b424a4d 100644
--- a/releng.wtpbuilder/distribution/patches3.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches3.site/build.xml
@@ -39,7 +39,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches3.site/publish.xml b/releng.wtpbuilder/distribution/patches3.site/publish.xml
index 8e0417b397f39ef060d20980e07efe6c06d66882..2c6e98cd7441eccf6bcae199bf8867c5898a77d3 100644
--- a/releng.wtpbuilder/distribution/patches3.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches3.site/publish.xml
@@ -49,39 +49,9 @@
</target>
<target
name="generateCompileIndex">
- <!--
- <taskdef name="indexResults"
- classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
- />
- -->
- <!--
- isBuildTested: true|false should JUnit plugin test results
- be used to generate index page dropTokenList: comma
- separated list of strings which should be replaced by the
- fileName attribute settings in the testManifest.xml.
- xmlDirectoryName: path to directory containing JUnit plugin
- test results in xml format (see doc is org.eclipse.test).
- dropDirectoryName: path to directory containing the result
- of the build. testResultsTemplateFileName: path to template
- file used to generate page with links to JUnit test results
- testResultsHtmlFileName: name of file which will be
- generated with links to JUnit test results dropHtmlFileName:
- name of generated index page hrefTestResultsTargetPath:
- relative path from index page to directory containing JUnit
- html test results hrefCompileLogsTargetPath: relative path
- from index page directory containing compilelogs
- testManifestFileName: name of xml file containing
- descriptions of zip types and log files
- -->
- <!--
- if not otherwise set, assume its a legacy case that did not
- use this
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<summarizeResults
@@ -163,15 +133,9 @@
testManifestFileName: name of xml file containing
descriptions of zip types and log files
-->
- <!--
- if not otherwise set, assume its a legacy case that did not
- use this
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/patches3.tests/build.xml b/releng.wtpbuilder/distribution/patches3.tests/build.xml
index 254aa7e215c3437e3c6b53fed1c5e4e1432fb1de..e9ae99278b8749581fa11aaf4dabdd508222904d 100644
--- a/releng.wtpbuilder/distribution/patches3.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches3.tests/build.xml
@@ -80,16 +80,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -229,7 +223,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches312.build/build.xml b/releng.wtpbuilder/distribution/patches312.build/build.xml
index af487ca3906b5005c68443d39bd413458f9e7751..dc882206ee07e6c82f436c0dfcfd7dcf8f46cd15 100644
--- a/releng.wtpbuilder/distribution/patches312.build/build.xml
+++ b/releng.wtpbuilder/distribution/patches312.build/build.xml
@@ -29,16 +29,10 @@
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <!--
- for this distribution, dependencies come from releng. assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/patches312.site/build.xml b/releng.wtpbuilder/distribution/patches312.site/build.xml
index 1fdc390f75ffc696cc42f04d570d0291e0c966ec..9719135b4048e7f5a2848cc31d94e3a7820bdf8f 100644
--- a/releng.wtpbuilder/distribution/patches312.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches312.site/build.xml
@@ -39,7 +39,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches312.site/publish.xml b/releng.wtpbuilder/distribution/patches312.site/publish.xml
index 89ee41a56115857046072fd17c1f86bc1ccba1e9..839069e7a5c968d06f1c20e5c9419346ca39a262 100644
--- a/releng.wtpbuilder/distribution/patches312.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches312.site/publish.xml
@@ -44,12 +44,10 @@
<echo
level="debug"
message="resultingIndex: ${resultingIndex}"/>
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -101,16 +99,10 @@
testManifestFileName: name of xml file containing
descriptions of zip types and log files
-->
- <!--
- for this distribution, dependencies come from releng. assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -220,16 +212,10 @@
testManifestFileName: name of xml file containing
descriptions of zip types and log files
-->
- <!--
- for this distribution, dependencies come from releng. assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
diff --git a/releng.wtpbuilder/distribution/patches312.tests/build.xml b/releng.wtpbuilder/distribution/patches312.tests/build.xml
index 1cb42cd96f8b21b0ae8bbcf4a700897a12432eb0..306756f72d3d4b72ffa31d4242d3f2d8c0665776 100644
--- a/releng.wtpbuilder/distribution/patches312.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches312.tests/build.xml
@@ -68,14 +68,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!-- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383). -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -282,7 +278,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches32x.build/build.xml b/releng.wtpbuilder/distribution/patches32x.build/build.xml
index aa3872e5ea75ceb1fb74471fc3c238ed56d3774f..52aa971e5aafa23cbe2f4d1040891118db71e737 100644
--- a/releng.wtpbuilder/distribution/patches32x.build/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.build/build.xml
@@ -35,16 +35,10 @@
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <!--
- for this distribution, dependencies come from releng. assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/patches32x.site/build.xml b/releng.wtpbuilder/distribution/patches32x.site/build.xml
index 670b51c44e22eace3db8e74444fa95243ea9e9b2..dc307d076d8d3ec1b059105305b38c1caba7a0f2 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches32x.site/publish.xml b/releng.wtpbuilder/distribution/patches32x.site/publish.xml
index e849f473f5030693359c4443dcdeec17e51f5741..3da24ea179af0b1f2432ad5b0fe8c299ed5947b5 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches32x.site/publish.xml
@@ -44,12 +44,10 @@
<echo
level="debug"
message="resultingIndex: ${resultingIndex}"/>
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -110,16 +108,10 @@
testManifestFileName: name of xml file containing
descriptions of zip types and log files
-->
- <!--
- for this distribution, dependencies come from releng. assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -229,16 +221,10 @@
testManifestFileName: name of xml file containing
descriptions of zip types and log files
-->
- <!--
- for this distribution, dependencies come from releng. assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
diff --git a/releng.wtpbuilder/distribution/patches32x.tests/build.xml b/releng.wtpbuilder/distribution/patches32x.tests/build.xml
index 632be45e73d2c91c6b502f725cffa843e0126047..d1419907a47e17726d3a632c28656a2b263e1918 100644
--- a/releng.wtpbuilder/distribution/patches32x.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.tests/build.xml
@@ -80,16 +80,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -321,7 +315,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/pave.build/build.xml b/releng.wtpbuilder/distribution/pave.build/build.xml
index 14239ebb1b4645e198892b14a56c7d71d6734665..9e0a82373fb4d6eb00df48cebcd3f7cb5ba6df43 100644
--- a/releng.wtpbuilder/distribution/pave.build/build.xml
+++ b/releng.wtpbuilder/distribution/pave.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/pave.site/build.xml b/releng.wtpbuilder/distribution/pave.site/build.xml
index 195353b38d00e1b650750114a128587ace5c0e27..0c74840fe9a5377149c7dfbe7025fef57c33b8fa 100644
--- a/releng.wtpbuilder/distribution/pave.site/build.xml
+++ b/releng.wtpbuilder/distribution/pave.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/pave.site/publish.xml b/releng.wtpbuilder/distribution/pave.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/distribution/pave.site/publish.xml
+++ b/releng.wtpbuilder/distribution/pave.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/pave.tests/build.xml b/releng.wtpbuilder/distribution/pave.tests/build.xml
index 61945fb085cdb980e11bbf7e6c01730fdefa5cc5..6e298d043cd9bc3a4ae3c8c2792de5f6b4d9ce2a 100644
--- a/releng.wtpbuilder/distribution/pave.tests/build.xml
+++ b/releng.wtpbuilder/distribution/pave.tests/build.xml
@@ -83,16 +83,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -242,7 +236,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/servadapt.build/build.xml b/releng.wtpbuilder/distribution/servadapt.build/build.xml
index 6c797f13a6c8d9a9d5281565abb7e849aae89582..f73333dc3598d636c060c9ebd6f1e9d06943be5a 100644
--- a/releng.wtpbuilder/distribution/servadapt.build/build.xml
+++ b/releng.wtpbuilder/distribution/servadapt.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/servadapt.site/build.xml b/releng.wtpbuilder/distribution/servadapt.site/build.xml
index 195353b38d00e1b650750114a128587ace5c0e27..0c74840fe9a5377149c7dfbe7025fef57c33b8fa 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/build.xml
+++ b/releng.wtpbuilder/distribution/servadapt.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/servadapt.site/publish.xml b/releng.wtpbuilder/distribution/servadapt.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/publish.xml
+++ b/releng.wtpbuilder/distribution/servadapt.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/vex.build/build.xml b/releng.wtpbuilder/distribution/vex.build/build.xml
index a2fa0220769937e9851fc0597e287adeb8a7ebb8..dc0885adf8544fc5b5116147669aafda22b80e9b 100644
--- a/releng.wtpbuilder/distribution/vex.build/build.xml
+++ b/releng.wtpbuilder/distribution/vex.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/vex.site/build.xml b/releng.wtpbuilder/distribution/vex.site/build.xml
index 195353b38d00e1b650750114a128587ace5c0e27..0c74840fe9a5377149c7dfbe7025fef57c33b8fa 100644
--- a/releng.wtpbuilder/distribution/vex.site/build.xml
+++ b/releng.wtpbuilder/distribution/vex.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/vex.site/publish.xml b/releng.wtpbuilder/distribution/vex.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/distribution/vex.site/publish.xml
+++ b/releng.wtpbuilder/distribution/vex.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/vex.tests/build.xml b/releng.wtpbuilder/distribution/vex.tests/build.xml
index 8b1a23e072179f84b9d76efe3916732be0b36deb..b730ba31f674f43771d5f2f6be53d5e1395eebe4 100644
--- a/releng.wtpbuilder/distribution/vex.tests/build.xml
+++ b/releng.wtpbuilder/distribution/vex.tests/build.xml
@@ -83,16 +83,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -242,7 +236,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wstfproj.build/build.xml b/releng.wtpbuilder/distribution/wstfproj.build/build.xml
index 07cd10440c9c684d3a9c84487f279b1c5d751274..8b3c3845504bf3d0fc645ec2bbf1d671a99cfe2d 100644
--- a/releng.wtpbuilder/distribution/wstfproj.build/build.xml
+++ b/releng.wtpbuilder/distribution/wstfproj.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/build.xml b/releng.wtpbuilder/distribution/wstfproj.site/build.xml
index 195353b38d00e1b650750114a128587ace5c0e27..0c74840fe9a5377149c7dfbe7025fef57c33b8fa 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/build.xml
+++ b/releng.wtpbuilder/distribution/wstfproj.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/publish.xml b/releng.wtpbuilder/distribution/wstfproj.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wstfproj.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index d533baf203675b94a8f2a4a70fe7a1f649d4016f..fc66f3f4236820b01a434c8225e43c485d2d639b 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -35,16 +35,10 @@
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <!--
- for this distribution, dependencies come from releng. assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index 670b51c44e22eace3db8e74444fa95243ea9e9b2..dc307d076d8d3ec1b059105305b38c1caba7a0f2 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index fe463518cab96b8b25e765c0580df1de75c1a61e..21ff22d036a0a4fdb1ad7f2a436d78e5dc915f36 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -44,12 +44,10 @@
<echo
level="debug"
message="resultingIndex: ${resultingIndex}"/>
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -110,16 +108,10 @@
testManifestFileName: name of xml file containing
descriptions of zip types and log files
-->
- <!--
- for this distribution, dependencies come from releng. assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -229,16 +221,10 @@
testManifestFileName: name of xml file containing
descriptions of zip types and log files
-->
- <!--
- for this distribution, dependencies come from releng. assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index d0ecb90c5692f10054e829caf8b24ab311034cda..ccd193f1658a5119d9802320e8cc9fa8dfe5ae84 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -81,16 +81,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -99,7 +93,7 @@
unless="dependency.properties.exists"/>
<property
name="test.dependency"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/testdependency.xml"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${testdependencyFileLocation}"/>
<available
file="${test.dependency}"
property="test.dependency.exists"/>
@@ -301,7 +295,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
index 4212b711546daf0adc77c5aec57de19673b20de7..b0fea822ad158fa448f5902d26b251ddd51acf83 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
@@ -81,16 +81,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -261,7 +255,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml b/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
index fb942679e74766209fe6a3073de2e38c6843c75d..4ecd67a4a63d645f712281df7c780258c9c6b559 100644
--- a/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
@@ -33,7 +33,7 @@
<!-- for this distribution, dependencies come from releng -->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/wtpcap.build/build.xml b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
index d08e847dabb43242b2d6b5b7b9e37cd235e7302f..d8a3d1a734757736853a05ad67a4d9ecd5978cf7 100644
--- a/releng.wtpbuilder/distribution/wtpcap.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/build.xml b/releng.wtpbuilder/distribution/wtpcap.site/build.xml
index 195353b38d00e1b650750114a128587ace5c0e27..0c74840fe9a5377149c7dfbe7025fef57c33b8fa 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/wtpjee.build/build.xml b/releng.wtpbuilder/distribution/wtpjee.build/build.xml
index deeed14babc855cba6777df0e6202458725243c2..059abac57a4eec10abe8f54b5e4047d219d7d781 100644
--- a/releng.wtpbuilder/distribution/wtpjee.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpjee.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/build.xml b/releng.wtpbuilder/distribution/wtpjee.site/build.xml
index 195353b38d00e1b650750114a128587ace5c0e27..0c74840fe9a5377149c7dfbe7025fef57c33b8fa 100644
--- a/releng.wtpbuilder/distribution/wtpjee.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtpjee.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/publish.xml b/releng.wtpbuilder/distribution/wtpjee.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/distribution/wtpjee.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtpjee.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/xml.build/build.xml b/releng.wtpbuilder/distribution/xml.build/build.xml
index 027772960a05a2049434064c2a1028d6120c7de8..f5fbacd4867ec4a196592a91f90e196ba4d65985 100644
--- a/releng.wtpbuilder/distribution/xml.build/build.xml
+++ b/releng.wtpbuilder/distribution/xml.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/xml.site/build.xml b/releng.wtpbuilder/distribution/xml.site/build.xml
index 195353b38d00e1b650750114a128587ace5c0e27..0c74840fe9a5377149c7dfbe7025fef57c33b8fa 100644
--- a/releng.wtpbuilder/distribution/xml.site/build.xml
+++ b/releng.wtpbuilder/distribution/xml.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/xml.site/publish.xml b/releng.wtpbuilder/distribution/xml.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/distribution/xml.site/publish.xml
+++ b/releng.wtpbuilder/distribution/xml.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/xml.tests/build.xml b/releng.wtpbuilder/distribution/xml.tests/build.xml
index d4183aeff0c7fc5f54698f48a9e6d76bb8ea7d2e..302ba7e1e436f144e4aa99e42e3e4c7a8dde8d65 100644
--- a/releng.wtpbuilder/distribution/xml.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/build.xml
@@ -83,16 +83,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -242,7 +236,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/xmlsec.build/build.xml b/releng.wtpbuilder/distribution/xmlsec.build/build.xml
index 7be5cac8db42c35f142224d4baffcacb84cbed4d..75b0d1eba1648086adbf2df88fd36393874e6202 100644
--- a/releng.wtpbuilder/distribution/xmlsec.build/build.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/build.xml b/releng.wtpbuilder/distribution/xmlsec.site/build.xml
index 195353b38d00e1b650750114a128587ace5c0e27..0c74840fe9a5377149c7dfbe7025fef57c33b8fa 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/build.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/build.xml b/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
index 2c776b2ee1e0b8c3b585e8cbe66c84aecbd29a5a..1a570e5f1a7831f6695a53c3f8f9371353acfd3f 100644
--- a/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
@@ -83,16 +83,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <!--
- for this distribution, dependencies come from releng. Assume
- no subdirectory, if not otherwise set (bug 285383).
- -->
- <property
- name="env.DEP_DIR"
- value=""/>
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
@@ -242,7 +236,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/xquery.build/build.xml b/releng.wtpbuilder/distribution/xquery.build/build.xml
index 1fdfd11cec71f90fca10a99b120e97330e8aa3d5..cfcf54ebb88631606f6b5885f5a5c0481d54d96f 100644
--- a/releng.wtpbuilder/distribution/xquery.build/build.xml
+++ b/releng.wtpbuilder/distribution/xquery.build/build.xml
@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/xquery.site/build.xml b/releng.wtpbuilder/distribution/xquery.site/build.xml
index 195353b38d00e1b650750114a128587ace5c0e27..0c74840fe9a5377149c7dfbe7025fef57c33b8fa 100644
--- a/releng.wtpbuilder/distribution/xquery.site/build.xml
+++ b/releng.wtpbuilder/distribution/xquery.site/build.xml
@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/xquery.site/publish.xml b/releng.wtpbuilder/distribution/xquery.site/publish.xml
index fe3faf8c428430af26f71c0ffc5aed3ac2d7b87d..6f7920718b52afa6ec957054a15809faf139ccab 100644
--- a/releng.wtpbuilder/distribution/xquery.site/publish.xml
+++ b/releng.wtpbuilder/distribution/xquery.site/publish.xml
@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
- file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 56052c50533e8c7e8785141286b6dd34bffb7fd1..a0b8282d6cdfbd244a65a97b8a4da41c71e78837 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -465,7 +465,7 @@
<jvmarg
value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
<jvmarg
- value="-DbuildType=${buildType}"/>
+ value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/scripts/standaloneTest/runtest.bat b/releng.wtpbuilder/scripts/standaloneTest/runtest.bat
index 39d6a413681bd1e5eae3768f82619a1e65afae6e..b4cc3bab083e8a9b8e6ead4573c5b7cb29f5b7bf 100644
--- a/releng.wtpbuilder/scripts/standaloneTest/runtest.bat
+++ b/releng.wtpbuilder/scripts/standaloneTest/runtest.bat
@@ -32,7 +32,6 @@ set PROJECT_BUILDERS=%BUILD_HOME%/projectBuilders
set PROJECT_PROJECTS=%BUILD_HOME%/projects
set PROJECT_TESTS=%BUILD_HOME%/tests
set RECOMMENDED_TMP_DIR=%BUILD_HOME%/temp
-set DEP_DIR=/helios
rem Note:
diff --git a/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml b/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml
index ff6202cd9514d239e8b379f3b57ef7f19ec462b5..8bb666ffc3ee63b3547337af599705362d978701 100644
--- a/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml
+++ b/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml
@@ -42,9 +42,7 @@
<property
name="testRoot"
value="${env.PROJECT_TESTS}/${projectname}"/>
- <property
- name="env.DEP_DIR"
- value="/helios"/>
+
<property
name="distribution"
value="wtp"/>
@@ -56,11 +54,11 @@
<!--
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
-->
<property
name="dependency.properties"
- value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
diff --git a/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml b/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml
index 58117a3810ea48b76987bedc25958c49b1a5d045..5ced9a6300cd2bf5448dbb09dbcba64f7a654098 100644
--- a/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml
+++ b/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml
@@ -43,8 +43,8 @@
name="testRoot"
value="${env.PROJECT_TESTS}/${projectname}"/>
<property
- name="env.DEP_DIR"
- value="/helios"/>
+ name="dependencyFileLocation"
+ value="/helios/maps/dependencies.properties"/>
<property
name="distribution"
value="wtp"/>
@@ -56,11 +56,11 @@
<!--
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
-->
<property
name="dependency.properties"
- value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+ value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>