285383 - need a Helios build stream
diff --git a/releng.control/ant_high_priority_galileo.sh b/releng.control/ant_high_priority.sh
similarity index 85%
rename from releng.control/ant_high_priority_galileo.sh
rename to releng.control/ant_high_priority.sh
index cb97923..88aeffc 100644
--- a/releng.control/ant_high_priority_galileo.sh
+++ b/releng.control/ant_high_priority.sh
@@ -19,8 +19,5 @@
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 a3588a3..0000000
--- 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 f0bacfb..0000000
--- 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 556a76e..0000000
--- 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 21165e1..be16c9e 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}"
@@ -192,6 +192,12 @@
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"/>
<property
@@ -224,6 +230,12 @@
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"/>
<property
@@ -267,6 +279,12 @@
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"/>
<property
@@ -296,8 +314,15 @@
</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"/>
<property
@@ -330,6 +355,12 @@
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"/>
<property
@@ -368,6 +399,12 @@
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"/>
<property
@@ -410,6 +447,12 @@
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"/>
<property
@@ -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 c58c1a1..782961b 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 478166a..d0314f6 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 fe3faf8..6f79207 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 e7aa7c4..1123253 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 fdb160e..a62d79a 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 f349598..a717292 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 edf82cd..7307a91 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 035d713..50200ad 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 d01fd61..a797918 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 ae1d0ea..dbda193 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 8c14280..49134fd 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 e23bcb3..40e3e9c 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 904876f..fd6c7a5 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 195353b..0c74840 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 fe3faf8..6f79207 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 efed284..feee151 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 081d161..d15c089 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 24dc253..c8e89fe 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 a5f6fe1..bbc0580 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 aeeee0d..b1c565b 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 62ae6ab..db11355 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 4748e65..78b260c 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 8e0417b..2c6e98c 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 aea274f..e647dde 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 95bdf2e..fc005bf 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 5c79d01..17ba001 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 3ee1693..b82487a 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 11e7ff0..fec0151 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 4748e65..78b260c 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 8e0417b..2c6e98c 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 254aa7e..e9ae992 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 af487ca..dc88220 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 1fdc390..9719135 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 89ee41a..839069e 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 1cb42cd..306756f 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 aa3872e..52aa971 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 670b51c..dc307d0 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 e849f47..3da24ea 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 632be45..d141990 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 14239eb..9e0a823 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 195353b..0c74840 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 fe3faf8..6f79207 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 61945fb..6e298d0 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 6c797f1..f73333d 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 195353b..0c74840 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 fe3faf8..6f79207 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 a2fa022..dc0885a 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 195353b..0c74840 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 fe3faf8..6f79207 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 8b1a23e..b730ba3 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 07cd104..8b3c384 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 195353b..0c74840 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 fe3faf8..6f79207 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 d533baf..fc66f3f 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 670b51c..dc307d0 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 fe46351..21ff22d 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 d0ecb90..ccd193f 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 4212b71..b0fea82 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 fb94267..4ecd67a 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 d08e847..d8a3d1a 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 195353b..0c74840 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 fe3faf8..6f79207 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 deeed14..059abac 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 195353b..0c74840 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 fe3faf8..6f79207 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 0277729..f5fbacd 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 195353b..0c74840 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 fe3faf8..6f79207 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 d4183ae..302ba7e 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 7be5cac..75b0d1e 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 195353b..0c74840 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 fe3faf8..6f79207 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 2c776b2..1a570e5 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 1fdfd11..cfcf54e 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 195353b..0c74840 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 fe3faf8..6f79207 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 56052c5..a0b8282 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 39d6a41..b4cc3ba 100644
--- a/releng.wtpbuilder/scripts/standaloneTest/runtest.bat
+++ b/releng.wtpbuilder/scripts/standaloneTest/runtest.bat
@@ -32,7 +32,6 @@
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 ff6202c..8bb666f 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 58117a3..5ced9a6 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"/>