From c72d9e3c536acd4e443d4d3ee55a865e3bf59ae3 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Fri, 16 Oct 2009 19:07:27 +0000
Subject: [PATCH] 292237 include pave project into build (correct and add
pre-reqs to standard template)
---
.../components/template/dependency.xml | 12 +++--
.../components/template_sdk/dependency.xml | 39 +++++++++++++---
.../components/template_tests/dependency.xml | 45 ++++++++++++++++---
.../components/pave/dependency.xml | 12 +++--
.../components/pave_sdk/dependency.xml | 39 +++++++++++++---
.../components/pave_tests/dependency.xml | 45 ++++++++++++++++---
6 files changed, 164 insertions(+), 28 deletions(-)
diff --git a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
index 41019e549..0055c2fd2 100644
--- a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
@@ -47,10 +47,14 @@
name="groupId"
value="eclipse"/>
</antcall>
- <!--
- <antcall target="getAndInstall"> <param name="groupId"
- value="dtp"/> </antcall>
- -->
+
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="dtp"/>
+ </antcall>
+
<antcall
target="getAndInstall">
<param
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
index ceeb396f0..d32292f24 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
@@ -12,21 +12,50 @@
name="get">
<!--
read in this properties, just so we can make sure our
- requested pre-reqs are defined
+ requested pre-reqs are defined, which we do later with
+ statements such if="${groupId}.url"
-->
<property
file="${dependency.properties}"/>
+ <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="emfvalidation"/>
+ </antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="gef"/>
+ </antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipse"/>
</antcall>
- <!--
- <antcall target="getAndInstall"> <param name="groupId"
- value="dtp"/> </antcall>
- -->
+
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="dtp"/>
+ </antcall>
+
<antcall
target="getAndInstall">
<param
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
index 51252c5bf..bfa9f19e4 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
@@ -12,7 +12,8 @@
name="get">
<!--
read in this properties, just so we can make sure our
- requested pre-reqs are defined
+ requested pre-reqs are defined, which we do later with
+ statements such if="${groupId}.url"
-->
<property
file="${dependency.properties}"/>
@@ -29,10 +30,44 @@
name="groupId"
value="eclipseTestFramework"/>
</antcall>
- <!--
- <antcall target="getAndInstall"> <param name="groupId"
- value="dtp"/> </antcall>
- -->
+ <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="emfvalidation"/>
+ </antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="gef"/>
+ </antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="eclipse"/>
+ </antcall>
+
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="dtp"/>
+ </antcall>
+
<antcall
target="getAndInstall">
<param
diff --git a/releng.wtpbuilder/components/pave/dependency.xml b/releng.wtpbuilder/components/pave/dependency.xml
index b0c27d284..40cdbfa8a 100644
--- a/releng.wtpbuilder/components/pave/dependency.xml
+++ b/releng.wtpbuilder/components/pave/dependency.xml
@@ -47,10 +47,14 @@
name="groupId"
value="eclipse"/>
</antcall>
- <!--
- <antcall target="getAndInstall"> <param name="groupId"
- value="dtp"/> </antcall>
- -->
+
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="dtp"/>
+ </antcall>
+
<antcall
target="getAndInstall">
<param
diff --git a/releng.wtpbuilder/components/pave_sdk/dependency.xml b/releng.wtpbuilder/components/pave_sdk/dependency.xml
index 9595b3982..acf7710a5 100644
--- a/releng.wtpbuilder/components/pave_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/pave_sdk/dependency.xml
@@ -12,21 +12,50 @@
name="get">
<!--
read in this properties, just so we can make sure our
- requested pre-reqs are defined
+ requested pre-reqs are defined, which we do later with
+ statements such if="${groupId}.url"
-->
<property
file="${dependency.properties}"/>
+ <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="emfvalidation"/>
+ </antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="gef"/>
+ </antcall>
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipse"/>
</antcall>
- <!--
- <antcall target="getAndInstall"> <param name="groupId"
- value="dtp"/> </antcall>
- -->
+
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="dtp"/>
+ </antcall>
+
<antcall
target="getAndInstall">
<param
diff --git a/releng.wtpbuilder/components/pave_tests/dependency.xml b/releng.wtpbuilder/components/pave_tests/dependency.xml
index b4b3e9c14..ae903dc7e 100644
--- a/releng.wtpbuilder/components/pave_tests/dependency.xml
+++ b/releng.wtpbuilder/components/pave_tests/dependency.xml
@@ -12,7 +12,8 @@
name="get">
<!--
read in this properties, just so we can make sure our
- requested pre-reqs are defined
+ requested pre-reqs are defined, which we do later with
+ statements such if="${groupId}.url"
-->
<property
file="${dependency.properties}"/>
@@ -29,10 +30,44 @@
name="groupId"
value="eclipseTestFramework"/>
</antcall>
- <!--
- <antcall target="getAndInstall"> <param name="groupId"
- value="dtp"/> </antcall>
- -->
+ <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="emfvalidation"/>
+ </antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="gef"/>
+ </antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="eclipse"/>
+ </antcall>
+
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="dtp"/>
+ </antcall>
+
<antcall
target="getAndInstall">
<param
--
GitLab