From bf62a20e9adb19ce69f3c291fa1f48ad0c26dede Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 27 Sep 2010 05:03:32 +0000
Subject: [PATCH] cleanup and simplify
---
releng.control/cc_config.xml | 52 ++----
.../distribution/template.site/build.xml | 3 +-
.../distribution/template.tests/build.xml | 3 +-
.../components/dali-sdk/build.properties | 3 +-
.../components/dali-sdk/customTargets.xml | 6 +-
.../components/dali-sdk/dependency.xml | 150 -----------------
.../dali-sdk/tobeInstalled.properties | 12 ++
.../components/dali.tests/build.properties | 6 +-
.../components/dali.tests/customTargets.xml | 6 +-
.../components/dali.tests/dependency.xml | 154 ------------------
.../dali.tests/tobeInstalled.properties | 12 ++
.../components/jst-sdk/build.properties | 10 +-
.../components/jst-sdk/customTargets.xml | 6 +-
.../components/jst-sdk/dependency.xml | 150 -----------------
.../jst-sdk/tobeInstalled.properties | 12 ++
.../components/jst.tests/build.properties | 10 +-
.../components/jst.tests/customTargets.xml | 6 +-
.../components/jst.tests/dependency.xml | 144 ----------------
.../jst.tests/tobeInstalled.properties | 12 ++
.../components/wst-sdk/build.properties | 11 +-
.../components/wst-sdk/customTargets.xml | 6 +-
.../components/wst-sdk/dependency.xml | 145 -----------------
.../wst-sdk/tobeInstalled.properties | 12 ++
.../components/wst.tests/build.properties | 10 +-
.../components/wst.tests/customTargets.xml | 6 +-
.../components/wst.tests/dependency.xml | 138 ----------------
.../wst.tests/tobeInstalled.properties | 12 ++
.../distribution/jsdt.site/build.xml | 3 +-
.../distribution/patches32x.site/build.xml | 3 +-
.../distribution/patches32x.tests/build.xml | 3 +-
.../distribution/wtp.site/build.xml | 3 +-
.../distribution/wtp.tests/build.xml | 12 +-
.../distribution/wtp.tests/perfbuild.xml | 3 +-
.../wtp.tests/tobeInstalled.properties | 14 ++
releng.wtpbuilder/scripts/build/runbuild.xml | 3 +-
35 files changed, 182 insertions(+), 959 deletions(-)
delete mode 100644 releng.wtpbuilder/components/dali-sdk/dependency.xml
create mode 100644 releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties
delete mode 100644 releng.wtpbuilder/components/dali.tests/dependency.xml
create mode 100644 releng.wtpbuilder/components/dali.tests/tobeInstalled.properties
delete mode 100644 releng.wtpbuilder/components/jst-sdk/dependency.xml
create mode 100644 releng.wtpbuilder/components/jst-sdk/tobeInstalled.properties
delete mode 100644 releng.wtpbuilder/components/jst.tests/dependency.xml
create mode 100644 releng.wtpbuilder/components/jst.tests/tobeInstalled.properties
delete mode 100644 releng.wtpbuilder/components/wst-sdk/dependency.xml
create mode 100644 releng.wtpbuilder/components/wst-sdk/tobeInstalled.properties
delete mode 100644 releng.wtpbuilder/components/wst.tests/dependency.xml
create mode 100644 releng.wtpbuilder/components/wst.tests/tobeInstalled.properties
create mode 100644 releng.wtpbuilder/distribution/wtp.tests/tobeInstalled.properties
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index b56852e4b..e65ac18dd 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -194,9 +194,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -232,9 +230,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -281,9 +277,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -319,9 +313,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildId"
value="3.3.0"/>
@@ -357,9 +349,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -401,9 +391,7 @@
<property
name="dependencyFileLocation"
value="indigo/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="indigo/jsdttestdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -452,9 +440,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/jsdttestdependency.xml"/>
+
<property
name="buildType"
value="M"/>
@@ -615,9 +601,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="passBuildEvenIfFailedTests"
value="true"/>
@@ -724,9 +708,7 @@
<property
name="dependencyFileLocation"
value="helios/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="helios/testdependency.xml"/>
+
<property
name="buildType"
value="M"/>
@@ -799,9 +781,7 @@
<property
name="dependencyFileLocation"
value="indigo/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="indigo/testdependency.xml"/>
+
<property
name="buildType"
value="S"/>
@@ -871,9 +851,7 @@
<property
name="dependencyFileLocation"
value="indigo/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="indigo/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -943,9 +921,7 @@
<property
name="dependencyFileLocation"
value="indigo4/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="indigo4/testdependency.xml"/>
+
<property
name="buildType"
value="I"/>
@@ -998,9 +974,7 @@
<property
name="dependencyFileLocation"
value="indigo/dependencies.properties"/>
- <property
- name="testdependencyFileLocation"
- value="indigo/testdependency.xml"/>
+
<property
name="buildType"
value="N"/>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
index e9d34135a..e78a891e5 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
@@ -44,8 +44,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index 4e9daac75..1de418655 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -239,8 +239,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/components/dali-sdk/build.properties b/releng.wtpbuilder/components/dali-sdk/build.properties
index 7eb271052..ec9f8df67 100644
--- a/releng.wtpbuilder/components/dali-sdk/build.properties
+++ b/releng.wtpbuilder/components/dali-sdk/build.properties
@@ -46,6 +46,7 @@ parallelCompilation=true
generateSourceReferences=true
compilelogsDir=compilelogs
+
topLevelElementType=feature
-topLevelElementId=org.eclipse.jpt_sdk.assembly.feature
+topLevelElementId=org.eclipse.jpt_sdk.assembly.feature
diff --git a/releng.wtpbuilder/components/dali-sdk/customTargets.xml b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
index 9c9762d8d..33179f2bc 100644
--- a/releng.wtpbuilder/components/dali-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
@@ -154,11 +154,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/dali-sdk/dependency.xml b/releng.wtpbuilder/components/dali-sdk/dependency.xml
deleted file mode 100644
index 87fbfb0d3..000000000
--- a/releng.wtpbuilder/components/dali-sdk/dependency.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
-
- ======================================================================
--->
-<project
- name="test"
- default="get">
-
- <target
- name="get">
-
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
-
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dtp"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
-
- </target>
- <target
- name="getAndInstall"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
-
diff --git a/releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties b/releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties
new file mode 100644
index 000000000..bea36b966
--- /dev/null
+++ b/releng.wtpbuilder/components/dali-sdk/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=false
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
diff --git a/releng.wtpbuilder/components/dali.tests/build.properties b/releng.wtpbuilder/components/dali.tests/build.properties
index 0fce6a2b3..72053e7d3 100644
--- a/releng.wtpbuilder/components/dali.tests/build.properties
+++ b/releng.wtpbuilder/components/dali.tests/build.properties
@@ -43,8 +43,10 @@ skipMirroring=true
flattenDependencies=true
parallelCompilation=true
+generateSourceReferences=true
+
compilelogsDir=testcompilelogs
+
topLevelElementType=feature
-topLevelElementId=org.eclipse.jpt.tests.assembly.feature
-generateSourceReferences=true
+topLevelElementId=org.eclipse.jpt.tests.assembly.feature
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index 7232cc9d4..7478783fb 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -154,11 +154,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/dali.tests/dependency.xml b/releng.wtpbuilder/components/dali.tests/dependency.xml
deleted file mode 100644
index e72f14eea..000000000
--- a/releng.wtpbuilder/components/dali.tests/dependency.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
-
-
- ======================================================================
--->
-<project
- name="test"
- default="get">
-
- <target
- name="get">
-
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dtp"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
-
- </target>
-
-
- <target
- name="getAndInstall"
- unless="skipGetAndInstall"
- if="${groupId}.url">
-
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
-
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
diff --git a/releng.wtpbuilder/components/dali.tests/tobeInstalled.properties b/releng.wtpbuilder/components/dali.tests/tobeInstalled.properties
new file mode 100644
index 000000000..79c7152bb
--- /dev/null
+++ b/releng.wtpbuilder/components/dali.tests/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst-sdk/build.properties b/releng.wtpbuilder/components/jst-sdk/build.properties
index a052c883c..818ac6328 100644
--- a/releng.wtpbuilder/components/jst-sdk/build.properties
+++ b/releng.wtpbuilder/components/jst-sdk/build.properties
@@ -40,9 +40,13 @@ p2.gathering=true
p2.compress=true
skipMirroring=true
+flattenDependencies=true
+parallelCompilation=true
+
+generateSourceReferences=true
+
compilelogsDir=compilelogs
+
topLevelElementType=feature
-topLevelElementId=org.eclipse.jst.sdk
-flattenDependencies=true
-parallelCompilation=true
\ No newline at end of file
+topLevelElementId=org.eclipse.jst.sdk
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index 06fa9f1f4..f525e0555 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -154,11 +154,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
deleted file mode 100644
index c33c43d35..000000000
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
- ======================================================================
--->
-<project
- name="test"
- default="get">
- <target
- name="get">
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dtp"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dita"/>
- </antcall>
- </target>
- <target
- name="getAndInstall"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst-sdk/tobeInstalled.properties b/releng.wtpbuilder/components/jst-sdk/tobeInstalled.properties
new file mode 100644
index 000000000..79c7152bb
--- /dev/null
+++ b/releng.wtpbuilder/components/jst-sdk/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst.tests/build.properties b/releng.wtpbuilder/components/jst.tests/build.properties
index d733e98c3..ef8e517b6 100644
--- a/releng.wtpbuilder/components/jst.tests/build.properties
+++ b/releng.wtpbuilder/components/jst.tests/build.properties
@@ -40,9 +40,13 @@ p2.gathering=true
p2.compress=true
skipMirroring=true
+flattenDependencies=true
+parallelCompilation=true
+
+generateSourceReferences=true
+
compilelogsDir=testcompilelogs
+
topLevelElementType=feature
-topLevelElementId=org.eclipse.jst.tests
-flattenDependencies=true
-parallelCompilation=true
\ No newline at end of file
+topLevelElementId=org.eclipse.jst.tests
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index 7232cc9d4..7478783fb 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -154,11 +154,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml
deleted file mode 100644
index 144f2540b..000000000
--- a/releng.wtpbuilder/components/jst.tests/dependency.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
- ======================================================================
--->
-<project
- name="test"
- default="get">
- <target
- name="get">
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dtp"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
- </target>
- <target
- name="getAndInstall"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst.tests/tobeInstalled.properties b/releng.wtpbuilder/components/jst.tests/tobeInstalled.properties
new file mode 100644
index 000000000..79c7152bb
--- /dev/null
+++ b/releng.wtpbuilder/components/jst.tests/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst-sdk/build.properties b/releng.wtpbuilder/components/wst-sdk/build.properties
index 3c397e1d4..e5fbf5965 100644
--- a/releng.wtpbuilder/components/wst-sdk/build.properties
+++ b/releng.wtpbuilder/components/wst-sdk/build.properties
@@ -40,11 +40,14 @@ p2.gathering=true
p2.compress=true
skipMirroring=true
-compilelogsDir=compilelogs
-topLevelElementType=feature
-topLevelElementId=org.eclipse.wst.sdk
-
flattenDependencies=true
parallelCompilation=true
+generateSourceReferences=true
+
+compilelogsDir=compilelogs
+
+topLevelElementType=feature
+
+topLevelElementId=org.eclipse.wst.sdk
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 2922c6503..6c9e3bd93 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -156,11 +156,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml
deleted file mode 100644
index d1ebfc0e3..000000000
--- a/releng.wtpbuilder/components/wst-sdk/dependency.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
- ======================================================================
--->
-<project
- name="test"
- default="get">
- <target
- name="get">
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dita"/>
- </antcall>
- </target>
- <target
- name="getAndInstall"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
-
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst-sdk/tobeInstalled.properties b/releng.wtpbuilder/components/wst-sdk/tobeInstalled.properties
new file mode 100644
index 000000000..c94b86630
--- /dev/null
+++ b/releng.wtpbuilder/components/wst-sdk/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=true
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst.tests/build.properties b/releng.wtpbuilder/components/wst.tests/build.properties
index ef3a3a734..9a9cd7a5b 100644
--- a/releng.wtpbuilder/components/wst.tests/build.properties
+++ b/releng.wtpbuilder/components/wst.tests/build.properties
@@ -40,9 +40,13 @@ p2.gathering=true
p2.compress=true
skipMirroring=true
+flattenDependencies=true
+parallelCompilation=true
+
+generateSourceReferences=true
+
compilelogsDir=testcompilelogs
+
topLevelElementType=feature
-topLevelElementId=org.eclipse.wst.tests.feature
-flattenDependencies=true
-parallelCompilation=true
\ No newline at end of file
+topLevelElementId=org.eclipse.wst.tests.feature
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
index c8459f409..7b3e4762f 100644
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml
@@ -156,11 +156,15 @@
<target
name="getDependencies">
<ant
- antfile="${component.dir}/dependency.xml"
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${component.dir}/tobeInstalled.properties"/>
+
</ant>
</target>
diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml
deleted file mode 100644
index 1b1be4e5b..000000000
--- a/releng.wtpbuilder/components/wst.tests/dependency.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ======================================================================
- Properties that must be passed to this script: base.install.dir
- dependencyTargets local.cache.dir dependency.properties
- ======================================================================
--->
-<project
- name="test"
- default="get">
- <target
- name="get">
- <!--
- read in this properties, just so we can make sure our
- requested pre-reqs are defined via {groupId}.url
- -->
- <property
- file="${dependency.properties}"/>
- <mkdir
- dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emf"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="gef"/>
- </antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="eclipse"/>
- </antcall>
- <antcall
- target="getAndInstallFramework">
- <param
- name="groupId"
- value="eclipseTestFramework"/>
- </antcall>
- </target>
- <target
- name="getAndInstall"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <target
- name="getAndInstallRepo"
- if="${groupId}.url">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}"/>
- </ant>
- <ant
- antfile="${dependencyTargets}"
- target="installRepo">
- <property
- name="groupId"
- value="${groupId}"/>
- <property
- name="install.destination"
- value="${base.install.dir}"/>
- </ant>
- </target>
- <!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
- <target
- name="getAndInstallFramework"
- depends="tryRepo"
- unless="isRepo">
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="tryRepo"
- depends="checkIfRepo"
- if="isRepo">
- <antcall
- target="getAndInstallRepo">
- <param
- name="groupId"
- value="${groupId}"/>
- </antcall>
- </target>
- <target
- name="checkIfRepo">
- <condition
- property="isRepo">
- <isset
- property="${groupId}.tobeinstalledfeaturegroups"/>
- </condition>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst.tests/tobeInstalled.properties b/releng.wtpbuilder/components/wst.tests/tobeInstalled.properties
new file mode 100644
index 000000000..79c7152bb
--- /dev/null
+++ b/releng.wtpbuilder/components/wst.tests/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emf=true
+getprereq.emfxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/build.xml b/releng.wtpbuilder/distribution/jsdt.site/build.xml
index 45bc1dfdb..7f204d5b4 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/build.xml
@@ -44,8 +44,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches32x.site/build.xml b/releng.wtpbuilder/distribution/patches32x.site/build.xml
index 45bc1dfdb..7f204d5b4 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.site/build.xml
@@ -44,8 +44,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches32x.tests/build.xml b/releng.wtpbuilder/distribution/patches32x.tests/build.xml
index 17be30819..65389203f 100644
--- a/releng.wtpbuilder/distribution/patches32x.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.tests/build.xml
@@ -336,8 +336,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index 45bc1dfdb..7f204d5b4 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -44,8 +44,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 041d254fb..cb7fe271c 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -93,19 +93,29 @@
unless="dependency.properties.exists"/>
<property
name="test.dependency"
- value="${buildDirectory}/maps/${env.RELENG}/${testdependencyFileLocation}"/>
+ value="${wtp.builder.home}/scripts/dependency/dependency.xml"/>
<available
file="${test.dependency}"
property="test.dependency.exists"/>
<fail
message="test dependency file not found: ${test.dependency}"
unless="test.dependency.exists"/>
+ <echo message="test.dependency file: ${test.dependency}" />
<ant
antfile="${test.dependency}"
target="get">
<property
name="base.install.dir"
value="${testRoot}"/>
+ <property
+ name="tobeinstalled.properties"
+ value="${wtp.builder.home}/distribution/${build.distribution}.tests/tobeInstalled.properties"/>
+ <property
+ name="installWorkingDirectory"
+ value="${testRoot}"/>
+
+
+
</ant>
<antcall
target="unzipTests"/>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
index 7ae504726..c8a366fe1 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
@@ -258,8 +258,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtp.tests/tobeInstalled.properties b/releng.wtpbuilder/distribution/wtp.tests/tobeInstalled.properties
new file mode 100644
index 000000000..babb454ee
--- /dev/null
+++ b/releng.wtpbuilder/distribution/wtp.tests/tobeInstalled.properties
@@ -0,0 +1,14 @@
+getprereq.eclipse=true
+getprereq.eclipsetestframework=true
+#getprereq.eclipseplatform=false
+getprereq.emf=false
+getprereq.emfxsd=false
+#getprereq.emfvalidation=false
+getprereq.gef=false
+getprereq.dtp=false
+#getprereq.wst=false
+#getprereq.jst=false
+getprereq.wtp=false
+#getprereq.dltk=false
+
+getprereq.testlibraries=true
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 3358fa055..99cf3d86f 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -468,8 +468,7 @@
value="-DbuildType=${buildType}"/>
<jvmarg
value="-DdependencyFileLocation=${dependencyFileLocation}"/>
- <jvmarg
- value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
+
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
--
GitLab