Skip to content

Commit 7789de6

Browse files
authored
Cleanup the terminal/ folder in CDT's source (#1360)
Now that the terminal has migrated to the Eclipse Platform this commit moves around the remaining parts of the terminal to their correct location in the CDT source tree - Move terminal connector features next to their defining bundles - Remove terminal-only profile from CDT's build system. - Remove terminal/ references in build scripts - Rename remaining connectors (cdtserial/remote) so their display name reflects new naming scheme. - Renaming bundles and packages for remaining connectors is excluded, a readme has been added to each explaining name
1 parent 904e191 commit 7789de6

File tree

41 files changed

+40
-356
lines changed

Some content is hidden

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

41 files changed

+40
-356
lines changed

.github/workflows/build-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ jobs:
7777
path: |
7878
event.json
7979
*/*/target/surefire-reports/*.xml
80-
terminal/plugins/org.eclipse.tm.terminal.test/target/surefire-reports/*.xml
8180
- name: Prepare Docs for upload
8281
if: (success() || failure()) && steps.filter.outputs.docs
8382
run: |

BUILDING.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,6 @@ Individual p2 repos can be turned on and off to allow building CDT, or parts of
7474

7575
Using any of the above profiles can skip large sets of tests. The CI build uses this to parallelize tests. See https://ci.eclipse.org/cdt/view/Gerrit/
7676

77-
#### terminal-only
78-
79-
The terminal directory has a special profile that enables only the terminal and its dependencies when used. The allows
80-
running maven like this `mvn -f terminal/pom.xml verify -P only-terminal` to build and test only the terminal
81-
and its dependencies. A special terminal only p2 site is created in `terminal/repo/target/repository`. The CI build
82-
uses this to speedup turnaround on changes only affecting the terminal. See https://ci.eclipse.org/cdt/view/Gerrit/
83-
8477
#### baseline-compare-and-replace
8578

8679
`baseline-compare-and-replace` profile controls whether baseline replace and compare

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ pipeline {
104104
post {
105105
always {
106106
container('cdt') {
107-
archiveArtifacts '*.log,serial/org.eclipse.cdt.native.serial/**,core/org.eclipse.cdt.core.*/**,*/*/target/surefire-reports/**,terminal/plugins/org.eclipse.tm.terminal.test/target/surefire-reports/**,**/target/work/data/.metadata/.log,releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip,releng/org.eclipse.cdt.repo/target/repository/**,releng/org.eclipse.cdt.testing.repo/target/org.eclipse.cdt.testing.repo.zip,releng/org.eclipse.cdt.testing.repo/target/repository/**,debug/org.eclipse.cdt.debug.application.product/target/product/*.tar.gz,debug/org.eclipse.cdt.debug.application.product/target/products/*.zip,debug/org.eclipse.cdt.debug.application.product/target/products/*.tar.gz,debug/org.eclipse.cdt.debug.application.product/target/repository/**'
108-
junit '*/*/target/surefire-reports/*.xml,terminal/plugins/org.eclipse.tm.terminal.test/target/surefire-reports/*.xml'
107+
archiveArtifacts '*.log,serial/org.eclipse.cdt.native.serial/**,core/org.eclipse.cdt.core.*/**,*/*/target/surefire-reports/**,**/target/work/data/.metadata/.log,releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip,releng/org.eclipse.cdt.repo/target/repository/**,releng/org.eclipse.cdt.testing.repo/target/org.eclipse.cdt.testing.repo.zip,releng/org.eclipse.cdt.testing.repo/target/repository/**,debug/org.eclipse.cdt.debug.application.product/target/product/*.tar.gz,debug/org.eclipse.cdt.debug.application.product/target/products/*.zip,debug/org.eclipse.cdt.debug.application.product/target/products/*.tar.gz,debug/org.eclipse.cdt.debug.application.product/target/repository/**'
108+
junit '*/*/target/surefire-reports/*.xml'
109109
}
110110
}
111111
}

RELEASING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ find $CDT_ROOT -type f -name MANIFEST.MF -exec sed -i s/12.2.0.qualifier/12.3.0.
8080
- Update Marketplace entries:
8181
- https://marketplace.eclipse.org/content/complete-eclipse-cc-ide/edit (Complete C/C++ IDE)
8282
- https://marketplace.eclipse.org/content/eclipse-cc-ide/edit (CDT)
83-
- https://marketplace.eclipse.org/content/tm-terminal/edit (Terminal)
83+
- https://marketplace.eclipse.org/content/eclipse-terminal/edit (Terminal) -- TODO hand ownership to Eclipse Platform
8484
- Publish the GitHub release page and create a discussion for it.
8585
- Forward the discussion email to cdt-dev
8686
- Update cdt.aggrcon with the final URL for the release

build/org.eclipse.cdt.managedbuilder.ui/OSGI-INF/org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceConfigurationAccess.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
</service>
66
<reference cardinality="0..1" field="enable" interface="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.GenerateCDBEnable" name="enable"/>
77
<reference cardinality="1..1" field="metadata" interface="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferencesMetadata" name="metadata"/>
8-
<reference cardinality="1..1" field="workspace" interface="org.eclipse.core.resources.IWorkspace" name="workspace"/>
8+
<reference cardinality="1..1" field="workspace" interface="IWorkspace" name="workspace"/>
99
<implementation class="org.eclipse.cdt.managedbuilder.internal.ui.compilationdatabase.PreferenceConfigurationAccess"/>
1010
</scr:component>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,6 @@
272272
<!-- Documentation -->
273273
<module>remote/org.eclipse.remote.doc.isv</module>
274274

275-
<module>terminal</module>
276-
277275
<module>jsoncdb</module>
278276
<module>cmake</module>
279277

@@ -302,6 +300,8 @@
302300
<module>dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests</module>
303301
<module>jtag/org.eclipse.cdt.debug.gdbjtag.core.tests</module>
304302
<module>memory/org.eclipse.cdt.debug.core.memory.tests</module>
303+
<module>remote/org.eclipse.tm.terminal.connector.remote.feature</module>
304+
<module>serial/org.eclipse.tm.terminal.connector.cdtserial.feature</module>
305305
<module>testsrunner/org.eclipse.cdt.testsrunner.tests</module>
306306

307307
<module>releng/org.eclipse.cdt.testing</module>

releng/CDT.setup

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
project="org.eclipse.cdt"/>
306306
<operand
307307
xsi:type="workingsets:ExclusionPredicate"
308-
excludedWorkingSet="//'cdt.workingsets'/@workingSets[name='CDT%20Json%20CDB'] //'cdt.workingsets'/@workingSets[name='CDT%20JTag'] //'cdt.workingsets'/@workingSets[name='CDT%20Launch'] //'cdt.workingsets'/@workingSets[name='CDT%20Launchbar'] //'cdt.workingsets'/@workingSets[name='CDT%20Releng'] //'cdt.workingsets'/@workingSets[name='CDT%20Remote'] //'cdt.workingsets'/@workingSets[name='CDT%20Terminal'] //'cdt.workingsets'/@workingSets[name='CDT%20Build'] //'cdt.workingsets'/@workingSets[name='CDT%20CMake'] //'cdt.workingsets'/@workingSets[name='CDT%20Codan'] //'cdt.workingsets'/@workingSets[name='CDT%20Core'] //'cdt.workingsets'/@workingSets[name='CDT%20Cross'] //'cdt.workingsets'/@workingSets[name='CDT%20Debug'] //'cdt.workingsets'/@workingSets[name='CDT%20DSF'] //'cdt.workingsets'/@workingSets[name='CDT%20DSF%20GDB'] //'cdt.workingsets'/@workingSets[name='CDT%20Doc'] //'cdt.workingsets'/@workingSets[name='CDT%20LLVM'] //'cdt.workingsets'/@workingSets[name='CDT%20Memory'] //'cdt.workingsets'/@workingSets[name='CDT%20Serial'] //'cdt.workingsets'/@workingSets[name='CDT%20Tests%20Runner'] //'cdt.workingsets'/@workingSets[name='CDT%20Tools%20Templates'] //'cdt.workingsets'/@workingSets[name='CDT%20Unit%20Test'] //'cdt.workingsets'/@workingSets[name='CDT%20Util'] //'cdt.workingsets'/@workingSets[name='CDT%20Visualizer'] //'cdt.workingsets'/@workingSets[name='CDT%20Windows']"/>
308+
excludedWorkingSet="//'cdt.workingsets'/@workingSets[name='CDT%20Json%20CDB'] //'cdt.workingsets'/@workingSets[name='CDT%20JTag'] //'cdt.workingsets'/@workingSets[name='CDT%20Launch'] //'cdt.workingsets'/@workingSets[name='CDT%20Launchbar'] //'cdt.workingsets'/@workingSets[name='CDT%20Releng'] //'cdt.workingsets'/@workingSets[name='CDT%20Remote'] //'cdt.workingsets'/@workingSets[name='CDT%20Build'] //'cdt.workingsets'/@workingSets[name='CDT%20CMake'] //'cdt.workingsets'/@workingSets[name='CDT%20Codan'] //'cdt.workingsets'/@workingSets[name='CDT%20Core'] //'cdt.workingsets'/@workingSets[name='CDT%20Cross'] //'cdt.workingsets'/@workingSets[name='CDT%20Debug'] //'cdt.workingsets'/@workingSets[name='CDT%20DSF'] //'cdt.workingsets'/@workingSets[name='CDT%20DSF%20GDB'] //'cdt.workingsets'/@workingSets[name='CDT%20Doc'] //'cdt.workingsets'/@workingSets[name='CDT%20LLVM'] //'cdt.workingsets'/@workingSets[name='CDT%20Memory'] //'cdt.workingsets'/@workingSets[name='CDT%20Serial'] //'cdt.workingsets'/@workingSets[name='CDT%20Tests%20Runner'] //'cdt.workingsets'/@workingSets[name='CDT%20Tools%20Templates'] //'cdt.workingsets'/@workingSets[name='CDT%20Unit%20Test'] //'cdt.workingsets'/@workingSets[name='CDT%20Util'] //'cdt.workingsets'/@workingSets[name='CDT%20Visualizer'] //'cdt.workingsets'/@workingSets[name='CDT%20Windows']"/>
309309
</predicate>
310310
</workingSet>
311311
<workingSet
@@ -440,13 +440,6 @@
440440
project="org.eclipse.cdt"
441441
relativePathPattern="remote/.*"/>
442442
</workingSet>
443-
<workingSet
444-
name="CDT Terminal">
445-
<predicate
446-
xsi:type="predicates:RepositoryPredicate"
447-
project="org.eclipse.cdt"
448-
relativePathPattern="terminal/.*"/>
449-
</workingSet>
450443
<workingSet
451444
name="CDT Tests Runner">
452445
<predicate

releng/scripts/check_features.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,18 @@ git ls-files -- \*/feature.xml | while read feature_xml; do
5656
# early copyright year.
5757
feature_start_year=2015
5858
;;
59+
remote/org.eclipse.tm.terminal.connector.remote.feature/feature.xml)
60+
# The git history does not show the proper start year for cmake because of https://github.com/eclipse-cdt/cdt/pull/1360
61+
# Note, we can't simply use --follow because that causes other features to have a too
62+
# early copyright year.
63+
feature_start_year=2015
64+
;;
65+
serial/org.eclipse.tm.terminal.connector.cdtserial.feature/feature.xml)
66+
# The git history does not show the proper start year for cmake because of https://github.com/eclipse-cdt/cdt/pull/1360
67+
# Note, we can't simply use --follow because that causes other features to have a too
68+
# early copyright year.
69+
feature_start_year=2018
70+
;;
5971
*)
6072
feature_start_year=$(git log --reverse --format='%ad' --date="format:%Y" -- $feature_xml $plugin_dir | head -1)
6173
;;

terminal/features/org.eclipse.tm.terminal.connector.remote.feature/.project renamed to remote/org.eclipse.tm.terminal.connector.remote.feature/.project

File renamed without changes.

terminal/features/org.eclipse.tm.terminal.connector.cdtserial.feature/.settings/org.eclipse.core.resources.prefs renamed to remote/org.eclipse.tm.terminal.connector.remote.feature/.settings/org.eclipse.core.resources.prefs

File renamed without changes.

0 commit comments

Comments
 (0)