diff options
author | Uwe Stieber | 2013-09-04 13:28:41 +0000 |
---|---|---|
committer | Uwe Stieber | 2013-09-04 13:28:41 +0000 |
commit | 1bcdd681945429e40c579254828ac056fc13f100 (patch) | |
tree | 9cc731912bbcdc4cc0383890c91467d7a3caa459 /target_explorer | |
parent | f5b3650761b1817389a672b1a50addb1b0627d7a (diff) | |
download | org.eclipse.tcf-1bcdd681945429e40c579254828ac056fc13f100.tar.gz org.eclipse.tcf-1bcdd681945429e40c579254828ac056fc13f100.tar.xz org.eclipse.tcf-1bcdd681945429e40c579254828ac056fc13f100.zip |
Target Explorer: Fallback to require TM Terminal dependencies instead of including them
Diffstat (limited to 'target_explorer')
4 files changed, 19 insertions, 41 deletions
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 83a487b91..04ad55783 100644 --- a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml +++ b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml @@ -22,22 +22,6 @@ <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/> </url> - <includes - id="org.eclipse.tm.terminal" - version="0.0.0"/> - - <includes - id="org.eclipse.tm.terminal.serial" - version="0.0.0"/> - - <includes - id="org.eclipse.tm.terminal.ssh" - version="0.0.0"/> - - <includes - id="org.eclipse.tm.terminal.telnet" - 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"/> @@ -71,9 +55,14 @@ <import plugin="org.eclipse.tm.terminal" version="3.2.100" match="greaterOrEqual"/> <import plugin="org.eclipse.tcf.te.ui.terminals" version="1.2.0" match="greaterOrEqual"/> <import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.tm.terminal.serial" version="2.1.300" match="greaterOrEqual"/> <import plugin="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/> <import plugin="org.eclipse.tm.terminal.telnet" version="2.1.300" match="greaterOrEqual"/> - <import plugin="org.eclipse.tm.terminal.serial" version="2.1.300" match="greaterOrEqual"/> + <import feature="org.eclipse.tm.terminal" version="3.2.100" match="greaterOrEqual"/> + <import feature="org.eclipse.tm.terminal.serial" version="2.1.300" match="greaterOrEqual"/> + <import feature="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/> + <import feature="org.eclipse.tm.terminal.telnet" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.tcf.te.ui.terminals.process" version="1.2.0" match="greaterOrEqual"/> </requires> <plugin 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 0a8967038..efaae929d 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 @@ -22,13 +22,13 @@ </url> <includes - id="org.eclipse.tm.terminal.core.sdk" - version="0.0.0"/> - - <includes id="org.eclipse.tcf.te.feature" version="0.0.0"/> + <requires> + <import feature="org.eclipse.tm.terminal.core.sdk" version="3.3.100" match="greaterOrEqual"/> + </requires> + <plugin id="org.eclipse.tcf.te.source" download-size="0" diff --git a/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml index ebc3b0e5b..3a9fab61c 100644 --- a/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml +++ b/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml @@ -22,22 +22,6 @@ <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/> </url> - <includes - id="org.eclipse.tm.terminal" - version="0.0.0"/> - - <includes - id="org.eclipse.tm.terminal.serial" - version="0.0.0"/> - - <includes - id="org.eclipse.tm.terminal.ssh" - version="0.0.0"/> - - <includes - id="org.eclipse.tm.terminal.telnet" - version="0.0.0"/> - <requires> <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/> <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/> @@ -52,12 +36,17 @@ <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/> <import plugin="org.eclipse.ui.forms" version="3.5.200" match="greaterOrEqual"/> <import plugin="org.eclipse.ui.ide" version="3.8.1" match="greaterOrEqual"/> + <import plugin="org.eclipse.cdt.core" version="5.4.1" match="greaterOrEqual"/> <import plugin="org.eclipse.tcf.te.ui.terminals" version="1.2.0" match="greaterOrEqual"/> <import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/> <import plugin="org.eclipse.tm.terminal.serial" version="2.1.300" match="greaterOrEqual"/> <import plugin="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/> <import plugin="org.eclipse.tm.terminal.telnet" version="2.1.300" match="greaterOrEqual"/> - <import plugin="org.eclipse.cdt.core" version="5.4.1" match="greaterOrEqual"/> + <import feature="org.eclipse.tm.terminal" version="3.2.100" match="greaterOrEqual"/> + <import feature="org.eclipse.tm.terminal.serial" version="2.1.300" match="greaterOrEqual"/> + <import feature="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/> + <import feature="org.eclipse.tm.terminal.telnet" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.tcf.te.ui.terminals.process" version="1.2.0" match="greaterOrEqual"/> </requires> <plugin 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 2bf58c9e9..69e251ad6 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 @@ -25,9 +25,9 @@ id="org.eclipse.tcf.te.terminals.feature" version="0.0.0"/> - <includes - id="org.eclipse.tm.terminal.core.sdk" - version="0.0.0"/> + <requires> + <import feature="org.eclipse.tm.terminal.core.sdk" version="3.3.100" match="greaterOrEqual"/> + </requires> <plugin id="org.eclipse.tcf.te.ui.terminals.source" |