Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2013-12-10 05:48:21 -0500
committerUwe Stieber2013-12-10 05:48:21 -0500
commitcb30de4391c6daeff5892acfef6fca78d76f2f66 (patch)
tree393177360df9ce05cd56e38843541a6bd51538dd
parent4f307e3c631827e5dda6a96871fdbc75da0670cb (diff)
downloadorg.eclipse.tcf-cb30de4391c6daeff5892acfef6fca78d76f2f66.tar.gz
org.eclipse.tcf-cb30de4391c6daeff5892acfef6fca78d76f2f66.tar.xz
org.eclipse.tcf-cb30de4391c6daeff5892acfef6fca78d76f2f66.zip
Releng: Improve TCF/TE Eclipse feature definitions
- Switch from including org.eclipse.tcf.* features into each other to require those features instead. More flexible P2 dependency resolution at install time. - Require the com.google.gson plugin instead of declaring it part of the org.eclipse.tcf.te.feature. More flexible P2 dependency resolution at install time. - com.google.gson plugin explicitly included into P2 repository aggregation via category.xml
-rw-r--r--admin/pom-config.xml10
-rw-r--r--features/org.eclipse.tcf.cdt.feature/feature.xml5
-rw-r--r--features/org.eclipse.tcf.cdt.sdk.feature/feature.xml11
-rw-r--r--features/org.eclipse.tcf.core.sdk.feature/feature.xml6
-rw-r--r--features/org.eclipse.tcf.feature/feature.xml5
-rw-r--r--features/org.eclipse.tcf.repo/category.xml14
-rw-r--r--features/org.eclipse.tcf.sdk.feature/feature.xml11
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.feature/feature.xml8
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml13
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml10
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml16
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml10
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml5
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml11
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml16
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml5
16 files changed, 47 insertions, 109 deletions
diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index 1720de240..350ed5c19 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -108,15 +108,6 @@
<enabled>true</enabled>
</releases>
</pluginRepository>
- <!--<pluginRepository>
- <id>repo.eclipse.org</id>
- <url>http://repo.eclipse.org/content/repositories</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases> <enabled>true</enabled>
- </releases> </pluginRepository>
- -->
<pluginRepository>
<id>cbi</id>
<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
@@ -216,6 +207,7 @@
<strictBinIncludes>false</strictBinIncludes>
<timestampProvider>jgit</timestampProvider>
<jgit.ignore>pom.xml</jgit.ignore>
+ <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
<sourceReferences>
<generate>true</generate>
</sourceReferences>
diff --git a/features/org.eclipse.tcf.cdt.feature/feature.xml b/features/org.eclipse.tcf.cdt.feature/feature.xml
index a089f40e9..cc5a8f92d 100644
--- a/features/org.eclipse.tcf.cdt.feature/feature.xml
+++ b/features/org.eclipse.tcf.cdt.feature/feature.xml
@@ -31,10 +31,6 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.feature"
- version="0.0.0"/>
-
<requires>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.8.1" match="greaterOrEqual"/>
@@ -54,6 +50,7 @@
<import plugin="org.eclipse.tcf.debug.ui" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.cdt.launch" version="7.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.cdt.dsf.ui" version="2.3.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.feature" version="1.2.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
index 002244640..7efdebf64 100644
--- a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
@@ -31,13 +31,10 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.tcf.cdt.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.tcf.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.cdt.feature" version="1.2.0" match="greaterOrEqual"/>
+ </requires>
<plugin
id="org.eclipse.tcf.cdt.ui.source"
diff --git a/features/org.eclipse.tcf.core.sdk.feature/feature.xml b/features/org.eclipse.tcf.core.sdk.feature/feature.xml
index c6d152841..3f5014cae 100644
--- a/features/org.eclipse.tcf.core.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.core.sdk.feature/feature.xml
@@ -31,9 +31,9 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.core.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
+ </requires>
<plugin
id="org.eclipse.tcf.source"
diff --git a/features/org.eclipse.tcf.feature/feature.xml b/features/org.eclipse.tcf.feature/feature.xml
index ef0d1cbca..eb9a6e457 100644
--- a/features/org.eclipse.tcf.feature/feature.xml
+++ b/features/org.eclipse.tcf.feature/feature.xml
@@ -31,10 +31,6 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.core.feature"
- version="0.0.0"/>
-
<requires>
<import plugin="org.eclipse.core.filesystem" version="1.3.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
@@ -57,6 +53,7 @@
<import plugin="org.eclipse.tcf.core" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.debug" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/features/org.eclipse.tcf.repo/category.xml b/features/org.eclipse.tcf.repo/category.xml
index 4f8a075e5..49e59c031 100644
--- a/features/org.eclipse.tcf.repo/category.xml
+++ b/features/org.eclipse.tcf.repo/category.xml
@@ -42,18 +42,24 @@
<feature url="features/org.eclipse.tcf.te.tcf.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.sdk.feature" version="0.0.0">
<category name="org.eclipse.tcf.te"/>
</feature>
- <feature url="features/org.eclipse.tcf.te.terminals.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.feature" version="0.0.0">
+ <feature url="features/org.eclipse.tcf.te.tcf.launch.cdt.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.launch.cdt.feature" version="0.0.0">
<category name="org.eclipse.tcf.te"/>
</feature>
- <feature url="features/org.eclipse.tcf.te.terminals.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.sdk.feature" version="0.0.0">
+ <feature url="features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature" version="0.0.0">
<category name="org.eclipse.tcf.te"/>
</feature>
- <feature url="features/org.eclipse.tcf.te.tcf.launch.cdt.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.launch.cdt.feature" version="0.0.0">
+ <feature url="features/org.eclipse.tcf.te.terminals.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.feature" version="0.0.0">
<category name="org.eclipse.tcf.te"/>
</feature>
- <feature url="features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature" version="0.0.0">
+ <feature url="features/org.eclipse.tcf.te.terminals.sdk.feature_0.0.0.qualifier.jar" id="org.eclipse.tcf.te.terminals.sdk.feature" version="0.0.0">
<category name="org.eclipse.tcf.te"/>
</feature>
+ <bundle id="com.google.gson" version="2.2.4.v201311231704">
+ <category name="org.eclipse.tcf.te"/>
+ </bundle>
+ <bundle id="com.google.gson.source" version="2.2.4.v201311231704">
+ <category name="org.eclipse.tcf.te"/>
+ </bundle>
<category-def name="org.eclipse.tcf" label="Target Communication Framework">
<description>
Target Communication Framework
diff --git a/features/org.eclipse.tcf.sdk.feature/feature.xml b/features/org.eclipse.tcf.sdk.feature/feature.xml
index 83edc5286..dc5cca43a 100644
--- a/features/org.eclipse.tcf.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.sdk.feature/feature.xml
@@ -31,13 +31,10 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.tcf.core.sdk.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.tcf.feature" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.core.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+ </requires>
<plugin
id="org.eclipse.tcf.debug.source"
diff --git a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
index bbf7c5c52..2340d2432 100644
--- a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
@@ -23,6 +23,7 @@
</url>
<requires>
+ <import plugin="com.google.gson" version="2.2.4" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.runtime" version="1.2.0" match="greaterOrEqual"/>
@@ -233,11 +234,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="com.google.gson"
- download-size="0"
- install-size="0"
- version="2.2.4.v201311231704"
- unpack="false"/>
-
</feature>
diff --git a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
index efa44db8b..bc16b120b 100644
--- a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
@@ -21,12 +21,10 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.te.feature"
- version="0.0.0"/>
-
<requires>
+ <import plugin="com.google.gson.source" version="2.2.4" match="greaterOrEqual"/>
<import feature="org.eclipse.tm.terminal.core.sdk" version="3.3.100" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.te.feature" version="1.2.0" match="greaterOrEqual"/>
</requires>
<plugin
@@ -197,11 +195,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="com.google.gson.source"
- download-size="0"
- install-size="0"
- version="2.2.4.v201311231704"
- unpack="false"/>
-
</feature>
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml
index 2a9ca1fe9..8d0a819f6 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml
@@ -22,14 +22,6 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.core.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.tcf.te.feature"
- version="0.0.0"/>
-
<requires>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
@@ -70,6 +62,8 @@
<import plugin="org.eclipse.tcf.te.tcf.core.scripting" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.log.core" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.ui.console" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.te.feature" version="1.2.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml
index d888c2811..057a55ffb 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/feature.xml
@@ -21,17 +21,11 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.core.sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.tcf.te.sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.tcf.te.tcf.core.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.tcf.core.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.te.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
+ </requires>
<plugin
id="org.eclipse.tcf.te.tcf.core.source"
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
index 658db1ef1..4506a1406 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.xml
@@ -22,14 +22,6 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.tcf.te.tcf.core.feature"
- version="0.0.0"/>
-
<requires>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.debug.core" version="3.7.100" match="greaterOrEqual"/>
@@ -64,6 +56,8 @@
<import plugin="org.eclipse.tcf.te.ui.swt" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.views" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.feature" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml
index 75bfedc23..88da09cbe 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml
@@ -22,10 +22,6 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.te.tcf.core.feature"
- version="0.0.0"/>
-
<requires>
<import plugin="org.eclipse.cdt.launch" version="7.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.cdt.debug.mi.core" version="7.2.0" match="greaterOrEqual"/>
@@ -51,6 +47,7 @@
<import plugin="org.eclipse.tcf.te.runtime" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.core" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.te.tcf.core.feature" version="1.2.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml
index 3fb9e0658..0bc841ceb 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.sdk.feature/feature.xml
@@ -21,13 +21,10 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.te.tcf.launch.cdt.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.tcf.te.tcf.core.sdk.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.tcf.te.tcf.launch.cdt.feature" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.te.tcf.core.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+ </requires>
<plugin
id="org.eclipse.tcf.te.tcf.launch.cdt.source"
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
index 698232134..13ba3563b 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.xml
@@ -21,17 +21,11 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.tcf.te.tcf.core.sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.tcf.te.tcf.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.tcf.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.te.tcf.core.sdk.feature" version="1.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.te.tcf.feature" version="1.2.0" match="greaterOrEqual"/>
+ </requires>
<plugin
id="org.eclipse.tcf.te.tcf.launch.core.source"
diff --git a/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml
index 69e251ad6..59eefb254 100644
--- a/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.terminals.sdk.feature/feature.xml
@@ -21,12 +21,9 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <includes
- id="org.eclipse.tcf.te.terminals.feature"
- version="0.0.0"/>
-
<requires>
<import feature="org.eclipse.tm.terminal.core.sdk" version="3.3.100" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tcf.te.terminals.feature" version="1.2.0" match="greaterOrEqual"/>
</requires>
<plugin

Back to the top