From 86a218b2c1e22dde3b1c0360f51473816d1b7dc0 Mon Sep 17 00:00:00 2001
From: Siva Velusamy <vsiva@google.com>
Date: Tue, 23 Oct 2012 08:09:08 -0700
Subject: adtpackage: make adtpackage depend on, not include features

If adtpackage is declared to provide a bunch of features, then it
doesn't seem possible upgrade those features to a later version.

This CL makes adtpackage simply depend on those features being
present, which allows for upgrading those features at a later time.

In order to achieve this, we first build all the features, and
dump them in the repository. Then the product build simply takes
the collection of repositories, and the product definition, and
creates the product.

Change-Id: I8ff7a7ea05aea9f08d69c624499185ec1578fbdb
---
 .../feature.xml                                    | 47 +++-------------------
 .../com.android.ide.eclipse.adt/feature.xml        |  6 +++
 2 files changed, 12 insertions(+), 41 deletions(-)

(limited to 'eclipse/features')

diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
index 12e4ef3..33b8803 100644
--- a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
@@ -22,35 +22,6 @@
       <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/>
    </url>
 
-   <includes
-         id="org.eclipse.platform"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="com.android.ide.eclipse.ddms"
-         version="0.0.0"/>
-
-   <includes
-         id="com.android.ide.eclipse.adt"
-         version="0.0.0"/>
-
-   <includes
-         id="com.android.ide.eclipse.gldebugger"
-         version="0.0.0"/>
-
-   <includes
-         id="com.android.ide.eclipse.hierarchyviewer"
-         version="0.0.0"/>
-
-   <includes
-         id="com.android.ide.eclipse.ndk"
-         version="0.0.0"/>
-
-   <includes
-         id="com.android.ide.eclipse.traceview"
-         version="0.0.0"/>
-
    <requires>
       <import feature="org.eclipse.platform"/>
       <import plugin="org.eclipse.equinox.app"/>
@@ -82,15 +53,9 @@
       <import plugin="org.eclipse.ltk.core.refactoring"/>
       <import plugin="org.eclipse.ltk.ui.refactoring"/>
       <import plugin="org.eclipse.core.expressions"/>
-      <import feature="org.eclipse.platform"/>
-      <import feature="org.eclipse.jdt" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform"/>
-      <import feature="org.eclipse.jdt" version="3.7.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui"/>
       <import feature="org.eclipse.help"/>
-      <import feature="org.eclipse.platform"/>
       <import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jdt" version="3.7.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.wst.common_core.feature"/>
       <import feature="org.eclipse.wst.common_ui.feature"/>
       <import feature="org.eclipse.wst.xml_core.feature"/>
@@ -106,12 +71,12 @@
       <import plugin="org.eclipse.cdt.dsf.gdb"/>
       <import plugin="org.eclipse.cdt.dsf.gdb.ui"/>
       <import plugin="org.eclipse.cdt.launch"/>
+      <import feature="com.android.ide.eclipse.ddms"            version="21.0.0" match="greaterOrEqual" />
+      <import feature="com.android.ide.eclipse.adt"             version="21.0.0" match="greaterOrEqual" />
+      <import feature="com.android.ide.eclipse.gldebugger"      version="21.0.0" match="greaterOrEqual" />
+      <import feature="com.android.ide.eclipse.hierarchyviewer" version="21.0.0" match="greaterOrEqual" />
+      <import feature="com.android.ide.eclipse.ndk"             version="21.0.0" match="greaterOrEqual" />
+      <import feature="com.android.ide.eclipse.traceview"       version="21.0.0" match="greaterOrEqual" />
    </requires>
 
-   <plugin
-         id="com.android.ide.eclipse.adt.package"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
 </feature>
diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
index 1360af0..d16c5a8 100644
--- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
@@ -158,4 +158,10 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.android.ide.eclipse.adt.package"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
-- 
cgit v1.1