From 2a0fea39592eafb92d3acb6881a7ad33f47d41f5 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber <martin.oberhuber@windriver.com>
Date: Mon, 1 Mar 2010 11:53:26 +0000
Subject: [PATCH] [releng] Try fixing tm.terminal.source generation

---
 .../build.properties                          |  2 --
 .../feature.xml                               | 22 +++++--------------
 .../feature.xml                               | 20 ++++++++---------
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/org.eclipse.tm.terminal.local-feature/build.properties b/org.eclipse.tm.terminal.local-feature/build.properties
index 1a5225239df..15b11eccda6 100644
--- a/org.eclipse.tm.terminal.local-feature/build.properties
+++ b/org.eclipse.tm.terminal.local-feature/build.properties
@@ -16,5 +16,3 @@ bin.includes = feature.xml,\
                license.html,\
                eclipse_update_120.jpg
 generate.plugin@org.eclipse.tm.terminal.local.source=org.eclipse.tm.terminal.local
-generate.plugin@org.eclipse.tm.terminal.source=org.eclipse.tm.terminal
-               
\ No newline at end of file
diff --git a/org.eclipse.tm.terminal.local-feature/feature.xml b/org.eclipse.tm.terminal.local-feature/feature.xml
index edade6577bb..fb5a6299ce0 100644
--- a/org.eclipse.tm.terminal.local-feature/feature.xml
+++ b/org.eclipse.tm.terminal.local-feature/feature.xml
@@ -33,6 +33,10 @@
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
+   <includes
+         id="org.eclipse.tm.terminal"
+         version="0.0.0"/>
+
  <requires>
  <!--
   <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
@@ -47,7 +51,7 @@
  </requires>
 
  <plugin id="org.eclipse.tm.terminal.local"
-  download-size="0"
+  download-size="18"
   install-size="47"
   version="0.0.0"
   unpack="false"
@@ -55,23 +59,9 @@
 
  <plugin
   id="org.eclipse.tm.terminal.local.source"
-  download-size="0"
+  download-size="25"
   install-size="43"
   version="0.0.0"
   unpack="false"/>
 
-  <plugin
-         id="org.eclipse.tm.terminal"
-         download-size="56"
-         install-size="56"
-         version="0.0.0"
-         unpack="false"/>
-
-  <plugin
-         id="org.eclipse.tm.terminal.source"
-         download-size="103"
-         install-size="107"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/org.eclipse.tm.terminal.sdk-feature/feature.xml b/org.eclipse.tm.terminal.sdk-feature/feature.xml
index 1114a8f9688..1f8beb8430a 100644
--- a/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -56,36 +56,36 @@
 
    <plugin
          id="org.eclipse.tm.terminal.source"
-         download-size="103"
-         install-size="107"
+         download-size="84"
+         install-size="137"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.tm.terminal.serial.source"
-         download-size="117"
-         install-size="122"
+         download-size="15"
+         install-size="23"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.tm.terminal.ssh.source"
-         download-size="133"
-         install-size="139"
+         download-size="17"
+         install-size="25"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.tm.terminal.telnet.source"
-         download-size="155"
-         install-size="163"
+         download-size="23"
+         install-size="32"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.tm.terminal.view.source"
-         download-size="182"
-         install-size="191"
+         download-size="27"
+         install-size="48"
          version="0.0.0"
          unpack="false"/>