From 857113e947155c5b93cb4e027ee974f27359b699 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Tue, 10 Jun 2008 13:39:42 +0000
Subject: [PATCH] [releng] Release wrapper features that contain plugins as
 well as source as well as included feature(s)

---
 .../org.eclipse.rse.build/customTargets.xml   | 50 ++++---------------
 releng/org.eclipse.rse.build/maps/rse.map     |  4 +-
 releng/org.eclipse.rse.build/maps/wince.map   |  2 +-
 3 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index a009f852d14..ca07c1eb771 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -5,10 +5,6 @@
 	<!-- Add one <ant> task for each top level element being built. -->
 	<!-- ===================================================================== -->
 	<target name="allElements">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.tm.terminal.sdk" />
-		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.core" />
@@ -35,16 +31,16 @@
 		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.terminals" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.remotecdt" />
+			<property name="id" value="org.eclipse.rse.sdk" />
 		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.useractions" />
 		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.remotecdt" />
+		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.wince" />
@@ -63,19 +59,11 @@
 		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.sdk" />
+			<property name="id" value="org.eclipse.tm.terminal.sdk" />
 		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.remotecdt.wrapper" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.useractions.wrapper" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.wince.wrapper" />
+			<property name="id" value="org.eclipse.rse.terminals" />
 		</ant>
 	</target>
 
@@ -86,12 +74,6 @@
 	<!-- Add one target for each root element and each configuration           -->
 	<!-- ===================================================================== -->
 
-	<target name="assemble.org.eclipse.tm.terminal.sdk">
-		<property name="archiveName" value="TM-terminal-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
 	<target name="assemble.org.eclipse.rse.core">
 		<property name="archiveName" value="RSE-runtime-core-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
@@ -170,24 +152,14 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.terminals">
-		<property name="archiveName" value="RSE-terminals-incubation-${buildId}.zip"/>
+	<target name="assemble.org.eclipse.tm.terminal.sdk">
+		<property name="archiveName" value="TM-terminal-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.remotecdt.wrapper">
-		<property name="archiveName" value="tmp_wrapper_remotecdt.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-	<target name="assemble.org.eclipse.rse.useractions.wrapper">
-		<property name="archiveName" value="tmp_wrapper_useractions.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-	<target name="assemble.org.eclipse.rse.wince.wrapper">
-		<property name="archiveName" value="tmp_wrapper_winceps.zip"/>
+	<target name="assemble.org.eclipse.rse.terminals">
+		<property name="archiveName" value="RSE-terminals-incubation-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map
index d37b2565afe..63fe79da744 100644
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ b/releng/org.eclipse.rse.build/maps/rse.map
@@ -7,14 +7,14 @@ feature@org.eclipse.rse.examples=v20080604,:pserver:anonymous:none@dev.eclipse.o
 feature@org.eclipse.rse.ftp=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
 feature@org.eclipse.rse.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
 feature@org.eclipse.rse.remotecdt=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt-feature
-feature@org.eclipse.rse.remotecdt.wrapper=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt.wrapper-feature
+feature@org.eclipse.rse.remotecdt.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt.wrapper-feature
 feature@org.eclipse.rse.sdk=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
 feature@org.eclipse.rse.ssh=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
 feature@org.eclipse.rse.telnet=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
 feature@org.eclipse.rse.terminals=v20080605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature
 feature@org.eclipse.rse.tests=v20080605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature
 feature@org.eclipse.rse.useractions=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions-feature
-feature@org.eclipse.rse.useractions.wrapper=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions.wrapper-feature
+feature@org.eclipse.rse.useractions.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions.wrapper-feature
 feature@org.eclipse.tm.releng.master=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.master-feature
 plugin@org.eclipse.dstore.core=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
 plugin@org.eclipse.dstore.doc.isv=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv
diff --git a/releng/org.eclipse.rse.build/maps/wince.map b/releng/org.eclipse.rse.build/maps/wince.map
index 11657110c60..02052bd025b 100644
--- a/releng/org.eclipse.rse.build/maps/wince.map
+++ b/releng/org.eclipse.rse.build/maps/wince.map
@@ -1,5 +1,5 @@
 feature@org.eclipse.rse.wince=v20080606,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.wince-feature
-feature@org.eclipse.rse.wince.wrapper=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.wince.wrapper-feature
+feature@org.eclipse.rse.wince.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.wince.wrapper-feature
 plugin@org.eclipse.rse.subsystems.wince=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.subsystems.wince
 plugin@org.eclipse.tm.rapi=v20080606,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi
 plugin@org.eclipse.tm.rapi.examples=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.examples