From f4826d5583f7ed4cbf91d105f2b1ed85ebf1bb4c Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Wed, 3 Jan 2007 03:02:06 +0000
Subject: [PATCH] prep for update sites
---
assembly/features/org.eclipse.jst.sdk/feature.xml | 7 +++++++
assembly/features/org.eclipse.wst.sdk/feature.xml | 8 ++++++++
releng.wtpbuilder/components/wst/customTargets.xml | 12 ------------
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml
index 77d874634..473046b6e 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.jst.sdk/feature.xml
@@ -47,6 +47,13 @@
id="org.eclipse.jst.doc.isv.feature"
version="0.0.0" />
+ <!-- technically, this last org.eclipse.jst feature include is not needed for the build or packaging,
+ but, it helps update manager behave more as expected (that is, it can filter out org.eclipse.wst
+ if user selects to -->
+ <includes
+ id="org.eclipse.jst"
+ version="0.0.0"/>
+
<plugin
id="org.eclipse.jst"
download-size="0"
diff --git a/assembly/features/org.eclipse.wst.sdk/feature.xml b/assembly/features/org.eclipse.wst.sdk/feature.xml
index e77bcf105..fc0327850 100644
--- a/assembly/features/org.eclipse.wst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.wst.sdk/feature.xml
@@ -48,6 +48,14 @@
id="org.eclipse.wst.doc.isv.feature"
version="0.0.0"/>
+ <!-- technically, this last org.eclipse.wst feature include is not needed for the build or packaging,
+ but, it helps update manager behave more as expected (that is, it can filter out org.eclipse.wst
+ if user selects to -->
+ <includes
+ id="org.eclipse.wst"
+ version="0.0.0"/>
+
+
<plugin
id="org.eclipse.wst"
download-size="0"
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index 73f327fd2..99d529ae2 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -61,18 +61,6 @@
name="archiveName"
value="${archiveName}" />
</ant>
-
- <!-- add zip entries of third party jars -->
- <!-- kind of crude for now, points back to our cached copy, for now -->
- <echo message="${buildDirectory}/../" />
- <property file="${buildDirectory}/../installmanifest.properties" />
- <zip
- destfile="${buildDirectory}/${buildLabel}/${archiveName}"
- update="true"
- duplicate="preserve">
- <zipfileset
- src="${thirdparty.dir}/${thirdparty.file}" />
- </zip>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
--
GitLab