295668 allow xulrunner location to be specified for unit tests
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index bce0ef5..2f5a999 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -2,6 +2,9 @@
name="PDECustomTargets"
default="noDefault"
basedir=".">
+ <property
+ name="buildfeature"
+ value="org.eclipse.wst"/>
<!--
= = = standard properties pattern = = = Note to be
cross-platform, "environment variables" are only appropriate for
@@ -54,6 +57,9 @@
message="baseLocation: ${baseLocation}"/>
<echo
level="debug"
+ message="patchFeature: ${patchFeature}"/>
+ <echo
+ level="debug"
message="generic target: ${genericTargets}"/>
<echo
message="compilerArg: ${compilerArg}"/>
@@ -67,7 +73,7 @@
value="feature"/>
<property
name="id"
- value="org.eclipse.wst"/>
+ value="${buildfeature}"/>
</ant>
</target>
<!--
@@ -308,7 +314,7 @@
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
<fileset
- dir="${buildDirectory}/features/org.eclipse.wst">
+ dir="${buildDirectory}/features/${buildfeature}">
<include
name="**/*.log.zip"/>
</fileset>
diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml
index e0701ed..56df953 100644
--- a/releng.wtpbuilder/components/wst/dependency.xml
+++ b/releng.wtpbuilder/components/wst/dependency.xml
@@ -10,6 +10,14 @@
default="get">
<target
name="get">
+
+ <!--
+ read in this properties, just so we can make sure our
+ requested pre-reqs are defined
+ -->
+ <property
+ file="${dependency.properties}"/>
+
<mkdir
dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
<antcall
@@ -71,7 +79,8 @@
</antcall>
</target>
<target
- name="getAndInstall">
+ name="getAndInstall"
+ if="${groupId}.url">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
diff --git a/releng.wtpbuilder/components/wtp-patches3/customTargets.xml b/releng.wtpbuilder/components/wtp-patches3/customTargets.xml
index 52b2090..f94ec2e 100644
--- a/releng.wtpbuilder/components/wtp-patches3/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches3/customTargets.xml
@@ -3,7 +3,7 @@
default="noDefault"
basedir=".">
<property
- name="patchFeature"
+ name="buildfeature"
value="org.eclipse.wtp.patch.assembly.feature"/>
<!--
= = = standard properties pattern = = = Note to be
@@ -27,9 +27,13 @@
<property
file="build.properties"/>
<fail
+ message="dependency.properties must be specified by distribution script"
+ unless="dependency.properties"/>
+ <fail
unless="buildDirectory"
message="buildDirectory must be set"/>
-
+ <echo
+ message="buildDirectory: ${buildDirectory}"/>
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
@@ -55,6 +59,9 @@
level="debug"
message="patchFeature: ${patchFeature}"/>
<echo
+ level="debug"
+ message="generic target: ${genericTargets}"/>
+ <echo
message="compilerArg: ${compilerArg}"/>
<echo
message="individualSourceBundles: ${individualSourceBundles}"/>
@@ -66,7 +73,7 @@
value="feature"/>
<property
name="id"
- value="${patchFeature}"/>
+ value="${buildfeature}"/>
</ant>
</target>
<!--
@@ -128,8 +135,7 @@
Steps to do before setup
-->
<target
- name="preSetup">
- </target>
+ name="preSetup"></target>
<!--
Steps to do after setup but before starting the build proper
-->
@@ -144,13 +150,24 @@
<echo
level="debug"
message="component.dir: ${component.dir}"/>
+
+ <!-- Get the dependencies -->
+ <antcall
+ target="getDependencies"/>
+ </target>
+ <!--
+ =====================================================================
+ -->
+ <!-- Get the dependencies based on releng maps -->
+ <!--
+ =====================================================================
+ -->
+ <target
+ name="getDependencies">
<ant
antfile="${component.dir}/dependency.xml"
target="get">
<property
- name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
- <property
name="base.install.dir"
value="${buildRoot}"/>
</ant>
@@ -160,22 +177,19 @@
Steps to do before fetching the build elements
-->
<target
- name="preFetch">
- </target>
+ name="preFetch"></target>
<!--
Steps to do after fetching the build elements
-->
<target
- name="postFetch">
- </target>
+ name="postFetch"></target>
<!--
Steps to do before generating the build scripts.
-->
<target
- name="preGenerate">
- </target>
+ name="preGenerate"></target>
<!--
Steps to do after generating the build scripts.
@@ -254,29 +268,25 @@
Steps to do after running assemble.
-->
<target
- name="postAssemble">
- </target>
+ name="postAssemble"></target>
<!--
Steps to do after the build is done.
-->
<target
- name="postBuild">
- </target>
+ name="postBuild"></target>
<!--
Steps to do to test the build results
-->
<target
- name="test">
- </target>
+ name="test"></target>
<!--
Steps to do to publish the build results
-->
<target
- name="publish">
- </target>
+ name="publish"></target>
<!--
Helper targets
@@ -302,7 +312,7 @@
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
<fileset
- dir="${buildDirectory}/features/${patchFeature}">
+ dir="${buildDirectory}/features/${buildfeature}">
<include
name="**/*.log.zip"/>
</fileset>
diff --git a/releng.wtpbuilder/components/wtp-patches3/dependency.xml b/releng.wtpbuilder/components/wtp-patches3/dependency.xml
index 9645448..36db1b5 100644
--- a/releng.wtpbuilder/components/wtp-patches3/dependency.xml
+++ b/releng.wtpbuilder/components/wtp-patches3/dependency.xml
@@ -31,6 +31,18 @@
name="base.install.dir"
value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
</antcall>
+ <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