Skip to content

Commit 904e191

Browse files
jonahgrahamjonahgraham
authored
Remove most org.eclipse.tm.terminal.* features (#1358)
With the TM Terminal migrated to Eclipse Terminal, remove the fine grained terminal features. The Eclipse Terminal feature will update from all of these features so users will have a continuous experience.
1 parent 5cdf0fe commit 904e191

File tree

50 files changed

+10
-977
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+10
-977
lines changed

‎NewAndNoteworthy/CHANGELOG-API.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ This section describes API removals that occurred in past releases, and upcoming
88

99
Below is the detailed descriptions of API changes and mitigation efforts API consumers need to take.
1010

11+
## API Changes in CDT 12.3.
12+
13+
### Migrate Terminal features to Eclipse Platform
14+
15+
As most of the terminal bundles have been migrated to Eclipse Platform, the Eclipse TM Terminal features will now upgrade to Eclipse Terminal Feature.
16+
Using a p2.inf file in org.eclipse.terminal.feature, that feature advertises as providing an update path for all of org.eclipse.tm.terminal features (except cdtserial and remote).
17+
See [Eclipse Platform PR#2199](https://github.com/eclipse-platform/eclipse.platform/pull/2199) for further details.
18+
1119
## API Changes in CDT 12.2.
1220

1321
### Migrate Terminal bundles to Eclipse Platform

‎debug/org.eclipse.cdt.debug.application.product/debug.product‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ United States, other countries, or both.
228228
<feature id="org.eclipse.cdt.testsrunner.feature" installMode="root"/>
229229
<feature id="org.eclipse.launchbar" installMode="root"/>
230230
<feature id="org.eclipse.launchbar.remote" installMode="root"/>
231-
<feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
231+
<feature id="org.eclipse.terminal.feature" installMode="root"/>
232232
<feature id="org.eclipse.tm.terminal.connector.cdtserial.feature" installMode="root"/>
233233
</features>
234234

‎releng/org.eclipse.cdt.repo/category.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -146,54 +146,18 @@
146146
<feature id="org.eclipse.launchbar.remote.source">
147147
<category name="launchbar"/>
148148
</feature>
149-
<feature id="org.eclipse.tm.terminal.control.feature">
150-
<category name="terminal_main"/>
151-
</feature>
152-
<feature id="org.eclipse.tm.terminal.control.feature.source">
153-
<category name="terminal_sdk"/>
154-
</feature>
155-
<feature id="org.eclipse.tm.terminal.connector.local.feature">
156-
<category name="terminal_main"/>
157-
</feature>
158-
<feature id="org.eclipse.tm.terminal.connector.local.feature.source">
159-
<category name="terminal_sdk"/>
160-
</feature>
161149
<feature id="org.eclipse.tm.terminal.connector.cdtserial.feature">
162150
<category name="terminal_main"/>
163151
</feature>
164152
<feature id="org.eclipse.tm.terminal.connector.cdtserial.feature.source">
165153
<category name="terminal_sdk"/>
166154
</feature>
167-
<feature id="org.eclipse.tm.terminal.connector.ssh.feature">
168-
<category name="terminal_main"/>
169-
</feature>
170-
<feature id="org.eclipse.tm.terminal.connector.ssh.feature.source">
171-
<category name="terminal_sdk"/>
172-
</feature>
173-
<feature id="org.eclipse.tm.terminal.connector.telnet.feature">
174-
<category name="terminal_main"/>
175-
</feature>
176-
<feature id="org.eclipse.tm.terminal.connector.telnet.feature.source">
177-
<category name="terminal_sdk"/>
178-
</feature>
179155
<feature id="org.eclipse.tm.terminal.connector.remote.feature">
180156
<category name="terminal_main"/>
181157
</feature>
182158
<feature id="org.eclipse.tm.terminal.connector.remote.feature.source">
183159
<category name="terminal_sdk"/>
184160
</feature>
185-
<feature id="org.eclipse.tm.terminal.view.feature">
186-
<category name="terminal_main"/>
187-
</feature>
188-
<feature id="org.eclipse.tm.terminal.view.feature.source">
189-
<category name="terminal_sdk"/>
190-
</feature>
191-
<feature id="org.eclipse.tm.terminal.feature">
192-
<category name="terminal_main"/>
193-
</feature>
194-
<feature id="org.eclipse.tm.terminal.feature.source">
195-
<category name="terminal_sdk"/>
196-
</feature>
197161
<feature id="org.eclipse.remote">
198162
<category name="remote"/>
199163
</feature>

‎releng/org.eclipse.cdt.target/cdt-baseline.target‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,7 @@
3939
<unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
4040
<unit id="org.eclipse.remote.telnet.feature.group" version="0.0.0"/>
4141
<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/>
42-
<unit id="org.eclipse.tm.terminal.connector.local.feature.feature.group" version="0.0.0"/>
4342
<unit id="org.eclipse.tm.terminal.connector.remote.feature.feature.group" version="0.0.0"/>
44-
<unit id="org.eclipse.tm.terminal.connector.ssh.feature.feature.group" version="0.0.0"/>
45-
<unit id="org.eclipse.tm.terminal.connector.telnet.feature.feature.group" version="0.0.0"/>
46-
<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
47-
<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
48-
<unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/>
4943
<unit id="org.eclipse.tools.templates.core" version="0.0.0"/>
5044
<unit id="org.eclipse.tools.templates.freemarker" version="0.0.0"/>
5145
<unit id="org.eclipse.tools.templates.ui" version="0.0.0"/>

‎releng/org.eclipse.cdt.target/cdt.target‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@
4545
<!-- We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace. -->
4646
<repository location="https://download.eclipse.org/tools/cdt/releases/12.2/cdt-12.2.0/"/>
4747
<unit id="org.eclipse.cdt.feature.group" version="0.0.0" />
48-
<!-- See matching comment in category.xml for why these are here -->
49-
<unit id="org.eclipse.tm.terminal.control" version="0.0.0" />
50-
<unit id="org.eclipse.tm.terminal.connector.process" version="0.0.0"/>
51-
<unit id="org.eclipse.tm.terminal.connector.local" version="0.0.0"/>
52-
<unit id="org.eclipse.tm.terminal.connector.ssh" version="0.0.0"/>
53-
<unit id="org.eclipse.tm.terminal.connector.telnet" version="0.0.0"/>
5448
</location>
5549
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
5650
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/latest/" />

‎releng/scripts/check_features.sh‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,6 @@ git ls-files -- \*/feature.xml | while read feature_xml; do
2424
plugin=$(xmllint --xpath 'string(//feature/@id)' $feature_xml)
2525
fi
2626

27-
if [ "$plugin" == 'org.eclipse.tm.terminal.control.feature' ]; then
28-
# this never contained about mappings and we moved the plugin to platform that does not contain mappings as well
29-
continue;
30-
fi
31-
32-
if [ "$plugin" == 'org.eclipse.tm.terminal.connector.ssh.feature' ]; then
33-
# this never contained about mappings and we moved the plugin to platform that does not contain mappings as well
34-
continue;
35-
fi
36-
37-
if [ "$plugin" == 'org.eclipse.tm.terminal.connector.telnet.feature' ]; then
38-
# this never contained about mappings and we moved the plugin to platform that does not contain mappings as well
39-
continue;
40-
fi
41-
42-
if [ "$plugin" == 'org.eclipse.tm.terminal.feature' ]; then
43-
# this never contained about mappings and we moved the plugin to platform that does not contain mappings as well
44-
continue;
45-
fi
46-
47-
if [ "$plugin" == 'org.eclipse.tm.terminal.view.feature' ]; then
48-
# this never contained about mappings and we moved the plugin to platform that does not contain mappings as well
49-
continue;
50-
fi
51-
5227
feature_dir=$(dirname ${feature_xml})
5328

5429
if [ $(find * -name $plugin -type d -not -path */target/* | wc -l) -ne 1 ]; then

‎releng/scripts/do_project_settings.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@ git ls-files -- \*\*/.project ":!$COREPROJECT/.project" | while read i ; do
9999
'-es@compilers.p.build.bin.includes=0@compilers.p.build.bin.includes=1@' \
100100
$d/.settings/org.eclipse.pde.prefs
101101
fi
102-
if echo $i | grep 'org.eclipse.tm.terminal.view.ui' > /dev/null; then
103-
# Special case, see comment in org.eclipse.tm.terminal.view.ui/plugin.xml
104-
sed -i \
105-
'-es@compilers.p.unknown-identifier=0@compilers.p.unknown-identifier=1@' \
106-
$d/.settings/org.eclipse.pde.prefs
107-
fi
108102
if echo $i | grep 'org.eclipse.cdt.codan.ui.cxx' > /dev/null; then
109103
# Special case, see comment in org.eclipse.cdt.codan.ui.cxx/plugin.xml
110104
sed -i \

‎terminal/features/org.eclipse.tm.terminal.connector.local.feature/.project‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎terminal/features/org.eclipse.tm.terminal.connector.local.feature/.settings/org.eclipse.core.resources.prefs‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎terminal/features/org.eclipse.tm.terminal.connector.local.feature/about.ini‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)