From bf3c0a8ec6bf1eb33920cabc956de1e5ff84db8b Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sat, 16 Dec 2006 03:55:34 +0000
Subject: [PATCH] prep for using JEM patch
---
releng.wtpbuilder/components/jst-sdk/dependency.xml | 5 +++++
.../components/jst.tests/dependency.xml | 5 +++++
releng.wtpbuilder/components/jst/dependency.xml | 5 +++++
.../components/wst-sdk/customTargets.xml | 12 +++++++++++-
releng.wtpbuilder/components/wst-sdk/dependency.xml | 5 +++++
.../components/wst.tests/dependency.xml | 5 +++++
releng.wtpbuilder/components/wst/customTargets.xml | 12 +++++++++++-
releng.wtpbuilder/components/wst/dependency.xml | 5 +++++
.../distribution/wtp.tests/testdependency.xml | 3 +++
9 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
index 794219378..60c33b44d 100644
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml
@@ -27,6 +27,11 @@
name="groupId"
value="jem" />
</antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="jempatch" />
+ </antcall>
<antcall target="getAndInstall">
<param
name="groupId"
diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml
index 74ab38460..ddcf602b2 100644
--- a/releng.wtpbuilder/components/jst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/jst.tests/dependency.xml
@@ -28,6 +28,11 @@
name="groupId"
value="jem" />
</antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="jempatch" />
+ </antcall>
<antcall target="getAndInstall">
<param
name="groupId"
diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml
index 6d3f241b9..b5b41376d 100644
--- a/releng.wtpbuilder/components/jst/dependency.xml
+++ b/releng.wtpbuilder/components/jst/dependency.xml
@@ -28,6 +28,11 @@
name="groupId"
value="jem" />
</antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="jempatch" />
+ </antcall>
<antcall target="getAndInstall">
<param
name="groupId"
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 60c7d0b21..6955250e1 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -73,7 +73,17 @@
<zipfileset
src="${thirdparty.dir}/${thirdparty.file}" />
</zip>
-
+
+ <!-- add zip entries of jempatch, the jem dev. patch -->
+ <echo message="${buildDirectory}/../" />
+ <property file="${buildDirectory}/../installmanifest.properties" />
+ <zip
+ destfile="${buildDirectory}/${buildLabel}/${archiveName}"
+ update="true"
+ duplicate="preserve">
+ <zipfileset
+ src="${jempatch.dir}/${jempatch.file}" />
+ </zip>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml
index d7895e24e..245a3c3d6 100644
--- a/releng.wtpbuilder/components/wst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/wst-sdk/dependency.xml
@@ -33,6 +33,11 @@
<param
name="groupId"
value="jem" />
+ </antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="jempatch" />
</antcall>
<antcall target="getAndInstall">
<param
diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml
index dbb1b4a6f..98b15cff3 100644
--- a/releng.wtpbuilder/components/wst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/wst.tests/dependency.xml
@@ -28,6 +28,11 @@
name="groupId"
value="jem" />
</antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="jempatch" />
+ </antcall>
<antcall target="getAndInstall">
<param
name="groupId"
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index 87c3ea4c2..6cb868066 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -73,7 +73,17 @@
<zipfileset
src="${thirdparty.dir}/${thirdparty.file}" />
</zip>
-
+
+ <!-- add zip entries of jempatch, the jem dev. patch -->
+ <echo message="${buildDirectory}/../" />
+ <property file="${buildDirectory}/../installmanifest.properties" />
+ <zip
+ destfile="${buildDirectory}/${buildLabel}/${archiveName}"
+ update="true"
+ duplicate="preserve">
+ <zipfileset
+ src="${jempatch.dir}/${jempatch.file}" />
+ </zip>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml
index e020dfc80..e54c05513 100644
--- a/releng.wtpbuilder/components/wst/dependency.xml
+++ b/releng.wtpbuilder/components/wst/dependency.xml
@@ -33,6 +33,11 @@
name="groupId"
value="jem" />
</antcall>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="jempatch" />
+ </antcall>
<antcall target="getAndInstall">
<param
name="groupId"
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
index f767fd4f7..fb686effa 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
@@ -19,6 +19,9 @@
<antcall target="getAndInstall">
<param name="groupId" value="jem" />
</antcall>
+ <antcall target="getAndInstall">
+ <param name="groupId" value="jempatch" />
+ </antcall>
<antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
--
GitLab