Skip to content

Commit 50d24f6

Browse files
laeubijonahgraham
authored andcommitted
Clean up serial support bundles/features
Renames native/ to serial/ as all that native/ had in it was serial port support. Moves the Eclipse Terminal serial connector from the terminal/ to serial/
1 parent 2f5548d commit 50d24f6

File tree

71 files changed

+15
-45
lines changed

Some content is hidden

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

71 files changed

+15
-45
lines changed

BUILDING.md

Lines changed: 2 additions & 2 deletions

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ pipeline {
104104
post {
105105
always {
106106
container('cdt') {
107-
archiveArtifacts '*.log,native/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/**'
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/**'
108108
junit '*/*/target/surefire-reports/*.xml,terminal/plugins/org.eclipse.tm.terminal.test/target/surefire-reports/*.xml'
109109
}
110110
}

NewAndNoteworthy/README.md

Lines changed: 2 additions & 2 deletions

core/org.eclipse.cdt.core.native/native_src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ WIN_TO_SIGN=$(OS_DIR_WIN32_X86_64)/starter.exe \
8787
$(OS_DIR_WIN32_X86_64)/spawner.dll \
8888
$(OS_DIR_WIN32_AARCH64)/starter.exe \
8989
$(OS_DIR_WIN32_AARCH64)/spawner.dll
90-
### This block of code also exists in native/org.eclipse.cdt.native.serial/native_src/Makefile
90+
### This block of code also exists in serial/org.eclipse.cdt.native.serial/native_src/Makefile
9191
TMPDIR := $(shell mktemp -d -t production-XXXXXXXXXX)
9292
.PHONY: production
9393
production: $(MAC_TO_SIGN) $(WIN_TO_SIGN)

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@
199199
<module>memory/org.eclipse.cdt.debug.ui.memory.transport</module>
200200
<module>memory/org.eclipse.cdt.debug.ui.memory-feature</module>
201201

202-
<module>native/org.eclipse.cdt.native.serial</module>
202+
<module>serial/org.eclipse.cdt.native.serial</module>
203+
<module>serial/org.eclipse.tm.terminal.connector.cdtserial</module>
203204

204205
<module>remote/org.eclipse.cdt.remote.core</module>
205206

releng/CDT.setup

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,11 +420,11 @@
420420
relativePathPattern="memory/.*"/>
421421
</workingSet>
422422
<workingSet
423-
name="CDT Native">
423+
name="CDT Serial">
424424
<predicate
425425
xsi:type="predicates:RepositoryPredicate"
426426
project="org.eclipse.cdt"
427-
relativePathPattern="native/.*"/>
427+
relativePathPattern="serial/.*"/>
428428
</workingSet>
429429
<workingSet
430430
name="CDT Releng">

releng/scripts/do_rebuild_natives.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fi
2323
##
2424
# Make sure that natives are up to date
2525
##
26-
for p in native/org.eclipse.cdt.native.serial core/org.eclipse.cdt.core.native; do
26+
for p in serial/org.eclipse.cdt.native.serial core/org.eclipse.cdt.core.native; do
2727
echo "Rebuilding $p JNI headers to make sure they match source"
2828
logfile=jni-headers-${p//\//-}.log
2929
if ! ${MVN:-mvn} -B -V process-resources -P jniheaders -f $p >${logfile} 2>&1; then

0 commit comments

Comments
 (0)