Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2014-05-17 06:11:01 -0400
committerUwe Stieber2014-05-17 06:11:01 -0400
commit0fd0439e84d60e19500824f54524c0c540f35c9b (patch)
tree119f18d41e2c189229d3d132f50b16a23e0c4a20
parent8be883856e7dce49cca63b25a75948e93da6c18d (diff)
downloadorg.eclipse.tcf-0fd0439e84d60e19500824f54524c0c540f35c9b.tar.gz
org.eclipse.tcf-0fd0439e84d60e19500824f54524c0c540f35c9b.tar.xz
org.eclipse.tcf-0fd0439e84d60e19500824f54524c0c540f35c9b.zip
Target Explorer: Fix Bug 435016 - [TERMINALS] No CR when running Node.js
scripts on Windows
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.feature/feature.xml8
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/feature.xml24
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.tcf.launch.cdt.feature/feature.xml1
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml5
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF2
9 files changed, 25 insertions, 23 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 2bb630129..1c6976cdb 100644
--- a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
@@ -32,6 +32,8 @@
<import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.runtime.persistence" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.cdt.core" version="5.6.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.cdt.debug.core" version="7.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.debug.core" version="3.7.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.core.cdt" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.runtime.concurrent" version="1.3.0" match="greaterOrEqual"/>
@@ -52,11 +54,10 @@
<import plugin="com.google.gson" version="2.2.4" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.variables" version="3.2.600" match="greaterOrEqual"/>
<import plugin="org.eclipse.help" version="3.6.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.terminal" version="3.2.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.terminals" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.terminals.process" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.tm.terminal" version="3.2.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal.serial" version="2.1.200" 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"/>
@@ -64,8 +65,7 @@
<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.cdt.core" version="5.6.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.cdt.debug.core" version="7.4.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.cdt.platform" version="8.3.0" match="greaterOrEqual"/>
</requires>
<plugin
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 181faca38..4b224ec80 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
@@ -27,16 +27,6 @@
<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"/>
- <import plugin="org.eclipse.core.filesystem" version="1.3.200" match="greaterOrEqual"/>
- <import plugin="org.eclipse.compare" version="3.5.300" match="greaterOrEqual"/>
- <import plugin="org.eclipse.text" version="3.5.200" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.ide" version="3.8.1" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.navigator" version="3.5.200" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.300" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.8.0" match="greaterOrEqual"/>
- <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.console" version="3.5.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.core" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.runtime" version="1.3.0" match="greaterOrEqual"/>
@@ -47,7 +37,15 @@
<import plugin="org.eclipse.tcf.te.runtime.statushandler" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.runtime.model" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.core" version="1.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.filesystem" version="1.3.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.tcf.te.tcf.core.model" version="1.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.compare" version="3.5.300" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.text" version="3.5.200" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui.ide" version="3.8.1" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui.navigator" version="3.5.200" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.300" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor" version="3.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.filesystem.core" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.ui" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui" version="1.3.0" match="greaterOrEqual"/>
@@ -55,17 +53,19 @@
<import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.views" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tcf.te.tcf.core.model" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.runtime.concurrent" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.processes.core" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.terminals.core" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.terminals" version="1.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.terminal" version="3.2.100" match="greaterOrEqual"/>
+ <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.tcf.te.tcf.core.scripting" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.log.core" version="1.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui.console" version="3.5.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.tcf.ui.console" version="1.3.0" match="greaterOrEqual"/>
<import feature="org.eclipse.tcf.core.feature" version="1.3.0" match="greaterOrEqual"/>
<import feature="org.eclipse.tcf.te.feature" version="1.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.tm.terminal" version="3.2.300" 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 1dbdf8145..2c42310cb 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
@@ -50,6 +50,7 @@
<import plugin="org.eclipse.cdt.dsf.gdb" version="4.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.cdt.dsf.gdb.ui" version="2.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.cdt.dsf" version="2.4.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.cdt" version="8.3.0" match="greaterOrEqual"/>
</requires>
<plugin
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 5d0c1eb66..ff8c9ee26 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
@@ -30,7 +30,6 @@
<import plugin="org.eclipse.tcf.te.core" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.runtime" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.runtime.services" version="1.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tcf.te.tcf.locator" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.controls" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.swt" version="1.3.0" match="greaterOrEqual"/>
@@ -38,8 +37,10 @@
<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.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.terminals" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.terminals.process" version="1.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.tcf.te.runtime.statushandler" version="1.3.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.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/>
@@ -48,7 +49,7 @@
<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.cdt.core" version="5.6.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.cdt.platform" version="8.3.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF
index 084c47e80..177c0ce84 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
org.eclipse.tcf.te.ui;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0",
- org.eclipse.tm.terminal;bundle-version="3.2.100",
+ org.eclipse.tm.terminal;bundle-version="3.2.300",
org.eclipse.ui;bundle-version="3.8.0",
org.eclipse.ui.forms;bundle-version="3.5.200",
org.eclipse.tcf.te.core;bundle-version="1.3.0"
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF
index bd1e892b3..b5a92a9cc 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6.0",
org.eclipse.tcf.te.runtime.services;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0",
- org.eclipse.tm.terminal;bundle-version="3.2.100",
+ org.eclipse.tm.terminal;bundle-version="3.2.300",
org.eclipse.ui;bundle-version="3.8.0",
org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0",
org.eclipse.core.expressions;bundle-version="3.4.400",
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF
index 523d760c6..01b741ec6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.serial/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
- org.eclipse.tm.terminal;bundle-version="3.2.100",
+ org.eclipse.tm.terminal;bundle-version="3.2.300",
org.eclipse.tm.terminal.serial;bundle-version="2.1.200",
org.eclipse.ui;bundle-version="3.8.0",
org.eclipse.ui.forms;bundle-version="3.5.200"
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF
index dba834873..9cb686f56 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0",
- org.eclipse.tm.terminal;bundle-version="3.2.100",
+ org.eclipse.tm.terminal;bundle-version="3.2.300",
org.eclipse.tm.terminal.ssh;bundle-version="2.1.300",
org.eclipse.ui;bundle-version="3.8.0",
org.eclipse.ui.forms;bundle-version="3.5.200"
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF
index 7e5711157..5d3736ca3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.controls;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0",
- org.eclipse.tm.terminal;bundle-version="3.2.100",
+ org.eclipse.tm.terminal;bundle-version="3.2.300",
org.eclipse.tm.terminal.telnet;bundle-version="2.1.300",
org.eclipse.ui;bundle-version="3.8.0",
org.eclipse.ui.forms;bundle-version="3.5.200"

Back to the top