From cf3d40dec316e52759e74b13c706e37799852fa1 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 17 Dec 2006 21:15:45 +0000
Subject: [PATCH] revisit method of JEM patch (replace instead of patch)
---
.../components/jst-sdk/dependency.xml | 5 --
.../components/jst.tests/dependency.xml | 3 +-
.../components/jst/dependency.xml | 5 --
.../components/wst-sdk/customTargets.xml | 11 ----
.../components/wst-sdk/dependency.xml | 65 ++++++-------------
.../components/wst.tests/dependency.xml | 2 +
.../components/wst/customTargets.xml | 11 ----
.../components/wst/dependency.xml | 5 --
.../distribution/wtp.api/build.xml | 2 +
.../distribution/wtp.tests/testdependency.xml | 2 +
10 files changed, 27 insertions(+), 84 deletions(-)
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
index 60c33b44d..794219378 100644
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml
@@ -27,11 +27,6 @@
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 186dfc083..faf49a752 100644
--- a/releng.wtpbuilder/components/jst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/jst.tests/dependency.xml
@@ -23,12 +23,13 @@
name="groupId"
value="gef" />
</antcall>
+ <!--
<antcall target="getAndInstall">
<param
name="groupId"
value="jem" />
</antcall>
-
+ -->
<antcall target="getAndInstall">
<param
name="groupId"
diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml
index b5b41376d..6d3f241b9 100644
--- a/releng.wtpbuilder/components/jst/dependency.xml
+++ b/releng.wtpbuilder/components/jst/dependency.xml
@@ -28,11 +28,6 @@
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 6955250e1..7f8edfeb5 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -74,17 +74,6 @@
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"
target="createChecksums">
diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml
index 245a3c3d6..583582194 100644
--- a/releng.wtpbuilder/components/wst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/wst-sdk/dependency.xml
@@ -8,73 +8,46 @@
====================================================================== -->
-<project
- name="test"
- default="get">
+<project name="test" default="get">
<target name="get">
- <antcall target="getAndInstall">
- <param
- name="groupId"
- value="thirdparty" />
- </antcall>
-
<antcall target="getAndInstall">
- <param
- name="groupId"
- value="emf" />
+ <param name="groupId" value="thirdparty" />
</antcall>
+
<antcall target="getAndInstall">
- <param
- name="groupId"
- value="gef" />
+ <param name="groupId" value="emf" />
</antcall>
<antcall target="getAndInstall">
- <param
- name="groupId"
- value="jem" />
+ <param name="groupId" value="gef" />
</antcall>
- <antcall target="getAndInstall">
- <param
- name="groupId"
- value="jempatch" />
+ <antcall target="getAndInstall">
+ <param name="groupId" value="jem" />
</antcall>
<antcall target="getAndInstall">
- <param
- name="groupId"
- value="eclipse" />
+ <param name="groupId" value="eclipse" />
</antcall>
<antcall target="getAndInstall">
- <param
- name="groupId"
- value="eclipseTestFramework" />
+ <param name="groupId"
+ value="eclipseTestFramework" />
</antcall>
<antcall target="getAndInstall">
- <param
- name="groupId"
- value="dita" />
+ <param name="groupId" value="dita" />
</antcall>
</target>
<target name="getAndInstall">
- <ant
- antfile="${dependencyTargets}"
- target="checkDependency">
- <property
- name="groupId"
- value="${groupId}" />
+ <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 antfile="${dependencyTargets}"
+ target="installDependency">
+ <property name="groupId" value="${groupId}" />
+ <property name="install.destination"
+ value="${base.install.dir}" />
</ant>
</target>
diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml
index dbb1b4a6f..e2c38c8d9 100644
--- a/releng.wtpbuilder/components/wst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/wst.tests/dependency.xml
@@ -23,11 +23,13 @@
name="groupId"
value="gef" />
</antcall>
+ <!--
<antcall target="getAndInstall">
<param
name="groupId"
value="jem" />
</antcall>
+ -->
<antcall target="getAndInstall">
<param
name="groupId"
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index 6cb868066..73f327fd2 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -74,17 +74,6 @@
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"
target="createChecksums">
diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml
index e54c05513..e020dfc80 100644
--- a/releng.wtpbuilder/components/wst/dependency.xml
+++ b/releng.wtpbuilder/components/wst/dependency.xml
@@ -33,11 +33,6 @@
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.api/build.xml b/releng.wtpbuilder/distribution/wtp.api/build.xml
index 3444b57e4..e5d6ebd54 100644
--- a/releng.wtpbuilder/distribution/wtp.api/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.api/build.xml
@@ -74,9 +74,11 @@
<antcall target="getAndInstall">
<param name="groupId" value="gef" />
</antcall>
+<!--
<antcall target="getAndInstall">
<param name="groupId" value="jem" />
</antcall>
+ -->
<antcall target="getAndInstall">
<param name="groupId" value="tomcat.5" />
</antcall>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
index f767fd4f7..158ebf7f9 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
@@ -16,9 +16,11 @@
<antcall target="getAndInstall">
<param name="groupId" value="gef" />
</antcall>
+ <!--
<antcall target="getAndInstall">
<param name="groupId" value="jem" />
</antcall>
+ -->
<antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
--
GitLab