From 239a09c4dfbe0ec7a2ec1132fe0ed2ad98715b2d Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Fri, 2 Oct 2009 06:38:12 +0000
Subject: [PATCH] check if pre-req defined in this stream dependencies
---
.../components/jst-sdk/dependency.xml | 21 ++++++++++++++++++-
.../components/jst.tests/dependency.xml | 21 ++++++++++++++++++-
.../components/jst/dependency.xml | 7 ++++++-
3 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
index ec790b98d..27699fdbd 100644
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml
@@ -13,6 +13,9 @@
<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" />
<antcall target="getAndInstall">
@@ -23,6 +26,22 @@
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
name="groupId"
@@ -73,7 +92,7 @@
</target>
- <target name="getAndInstall">
+ <target name="getAndInstall" if="${groupId}.url">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml
index 6a8291cec..88eabbe20 100644
--- a/releng.wtpbuilder/components/jst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/jst.tests/dependency.xml
@@ -14,6 +14,9 @@
<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" />
<antcall target="getAndInstall">
@@ -24,6 +27,22 @@
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
name="groupId"
@@ -67,7 +86,7 @@
</target>
- <target name="getAndInstall">
+ <target name="getAndInstall" if="${groupId}.url">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml
index 029021722..bf43e4676 100644
--- a/releng.wtpbuilder/components/jst/dependency.xml
+++ b/releng.wtpbuilder/components/jst/dependency.xml
@@ -14,6 +14,11 @@
<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" />
<antcall target="getAndInstall">
<param
@@ -87,7 +92,7 @@
</target>
- <target name="getAndInstall">
+ <target name="getAndInstall" if="${groupId}.url">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
--
GitLab