From d35676718fd2dadc08ea37b524f5bf30b9b82cd8 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 3 Jun 2010 07:22:21 +0000
Subject: [PATCH] Bug 315124 -  [terminal][local][releng] Local Terminal does
 not work if installed stand-alone without Terminal View

---
 releng/org.eclipse.rse.build/customTargets.xml  |  4 ++--
 releng/org.eclipse.rse.build/maps/terminal.map  |  1 +
 .../feature.xml                                 |  2 +-
 releng/org.eclipse.tm.releng/buildExtra.xml     |  3 +++
 releng/org.eclipse.tm.releng/maps/terminal.map  |  1 +
 .../build.properties                            |  1 -
 .../feature.properties                          |  2 +-
 .../feature.xml                                 | 13 ++-----------
 .../.project                                    | 17 +++++++++++++++++
 .../META-INF/MANIFEST.MF                        |  2 +-
 10 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 terminal/org.eclipse.tm.terminal.local.sdk-feature/.project

diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index fe61685c379..1d9a7b82722 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -49,7 +49,7 @@
 		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.tm.terminal.local" />
+			<property name="id" value="org.eclipse.tm.terminal.local.sdk" />
 		</ant>
 	</target>
 
@@ -111,7 +111,7 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.tm.terminal.local">
+	<target name="assemble.org.eclipse.tm.terminal.local.sdk">
 		<property name="archiveName" value="TM-terminal-local-incubation-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map
index c105ebbae48..61460434d5c 100644
--- a/releng/org.eclipse.rse.build/maps/terminal.map
+++ b/releng/org.eclipse.rse.build/maps/terminal.map
@@ -1,5 +1,6 @@
 feature@org.eclipse.tm.terminal=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
 feature@org.eclipse.tm.terminal.local=v201005290650,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature
+feature@org.eclipse.tm.terminal.local.sdk=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local.sdk-feature
 feature@org.eclipse.tm.terminal.sdk=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
 feature@org.eclipse.tm.terminal.serial=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
 feature@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature
diff --git a/releng/org.eclipse.tm.releng.master-feature/feature.xml b/releng/org.eclipse.tm.releng.master-feature/feature.xml
index 1ce293c1e9f..73999d7730e 100644
--- a/releng/org.eclipse.tm.releng.master-feature/feature.xml
+++ b/releng/org.eclipse.tm.releng.master-feature/feature.xml
@@ -42,7 +42,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.tm.terminal.local"
+         id="org.eclipse.tm.terminal.local.sdk"
          version="0.0.0"/>
 
    <includes
diff --git a/releng/org.eclipse.tm.releng/buildExtra.xml b/releng/org.eclipse.tm.releng/buildExtra.xml
index 5fe8b9cfe62..2bb06cc165f 100644
--- a/releng/org.eclipse.tm.releng/buildExtra.xml
+++ b/releng/org.eclipse.tm.releng/buildExtra.xml
@@ -154,6 +154,9 @@
 				<include name="**/org.eclipse.tm.terminal.local*" />
 				<include name="**/org.eclipse.tm.terminal.local*/**" />
 				<include name="**/org.eclipse.tm.terminal.local*/**/**" />
+				<include name="**/org.eclipse.tm.terminal.view_*" />
+				<include name="**/org.eclipse.tm.terminal.view_*/**" />
+				<include name="**/org.eclipse.tm.terminal.view_*/**/**" />
 			</zipfileset>
 		</zip>
 
diff --git a/releng/org.eclipse.tm.releng/maps/terminal.map b/releng/org.eclipse.tm.releng/maps/terminal.map
index c105ebbae48..61460434d5c 100644
--- a/releng/org.eclipse.tm.releng/maps/terminal.map
+++ b/releng/org.eclipse.tm.releng/maps/terminal.map
@@ -1,5 +1,6 @@
 feature@org.eclipse.tm.terminal=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
 feature@org.eclipse.tm.terminal.local=v201005290650,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature
+feature@org.eclipse.tm.terminal.local.sdk=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local.sdk-feature
 feature@org.eclipse.tm.terminal.sdk=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
 feature@org.eclipse.tm.terminal.serial=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
 feature@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/build.properties b/terminal/org.eclipse.tm.terminal.local-feature/build.properties
index 15b11eccda6..5336e1f0eda 100644
--- a/terminal/org.eclipse.tm.terminal.local-feature/build.properties
+++ b/terminal/org.eclipse.tm.terminal.local-feature/build.properties
@@ -15,4 +15,3 @@ bin.includes = feature.xml,\
                epl-v10.html,\
                license.html,\
                eclipse_update_120.jpg
-generate.plugin@org.eclipse.tm.terminal.local.source=org.eclipse.tm.terminal.local
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/feature.properties b/terminal/org.eclipse.tm.terminal.local-feature/feature.properties
index 5f1425a6fe6..6dcc6dd75fa 100644
--- a/terminal/org.eclipse.tm.terminal.local-feature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal.local-feature/feature.properties
@@ -26,7 +26,7 @@ tmUpdateSiteName=Target Management 3.2 Updates
 
 # "description" property - description of the feature
 description=A terminal emulation for local shells and external tools.\n\
-Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac. Includes Source.
+Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/feature.xml b/terminal/org.eclipse.tm.terminal.local-feature/feature.xml
index 520aec75c08..ef0813f32fa 100644
--- a/terminal/org.eclipse.tm.terminal.local-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.local-feature/feature.xml
@@ -34,16 +34,14 @@
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
    </url>
 
-   <includes
-         id="org.eclipse.tm.terminal"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.cdt.core" version="5.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.tm.terminal" version="3.0.0" match="equivalent"/>
+      <import plugin="org.eclipse.tm.terminal.view" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.externaltools"/>
    </requires>
@@ -55,11 +53,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.tm.terminal.local.source"
-         download-size="25"
-         install-size="43"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/terminal/org.eclipse.tm.terminal.local.sdk-feature/.project b/terminal/org.eclipse.tm.terminal.local.sdk-feature/.project
new file mode 100644
index 00000000000..150da9a0fdd
--- /dev/null
+++ b/terminal/org.eclipse.tm.terminal.local.sdk-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.tm.terminal.local.sdk-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/terminal/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
index 058ba465e64..b192be99f47 100644
--- a/terminal/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
 Bundle-Activator: org.eclipse.tm.internal.terminal.local.LocalTerminalActivator
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.tm.terminal;bundle-version="2.0.0",
+Require-Bundle: org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)",
  org.eclipse.cdt.core;bundle-version="5.2.0",
  org.eclipse.core.runtime,
  org.eclipse.debug.core,