From 50d24f6f8a668d25e139ee54e6c5e1e7b24c16c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Fri, 3 Oct 2025 18:18:15 +0200 Subject: [PATCH] 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/ --- BUILDING.md | 4 +-- Jenkinsfile | 2 +- NewAndNoteworthy/README.md | 4 +-- .../native_src/Makefile | 2 +- pom.xml | 3 +- releng/CDT.setup | 4 +-- releng/scripts/do_rebuild_natives.sh | 2 +- .../org.eclipse.cdt.native.serial/.classpath | 0 .../org.eclipse.cdt.native.serial/.gitignore | 0 .../org.eclipse.cdt.native.serial/.project | 0 .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.launching.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.pde.api.tools.prefs | 0 .../.settings/org.eclipse.pde.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../org.eclipse.cdt.native.serial/about.html | 0 .../build.properties | 0 .../cdt_logo_icon32.png | Bin .../native_src/.gitignore | 0 .../native_src/Makefile | 0 .../native_src/Readme.md | 0 .../org_eclipse_cdt_serial_SerialPort.h | 0 .../native_src/serial.c | 0 .../os/linux/aarch64/libserial.so | Bin .../os/linux/ppc64le/libserial.so | Bin .../os/linux/riscv64/libserial.so | Bin .../os/linux/x86_64/libserial.so | Bin .../os/macosx/aarch64/libserial.jnilib | Bin .../os/macosx/x86_64/libserial.jnilib | Bin .../os/win32/aarch64/.gitignore | 0 .../os/win32/aarch64/serial.dll | Bin .../os/win32/x86_64/.gitignore | 0 .../os/win32/x86_64/serial.dll | Bin .../plugin.properties | 0 .../org.eclipse.cdt.native.serial/pom.xml | 2 +- .../src/org/eclipse/cdt/serial/BaudRate.java | 0 .../src/org/eclipse/cdt/serial/ByteSize.java | 0 .../src/org/eclipse/cdt/serial/Parity.java | 0 .../org/eclipse/cdt/serial/SerialPort.java | 0 .../eclipse/cdt/serial/StandardBaudRates.java | 0 .../src/org/eclipse/cdt/serial/StopBits.java | 0 .../eclipse/cdt/serial/internal/Messages.java | 0 .../cdt/serial/internal/messages.properties | 0 .../.classpath | 0 .../.gitignore | 0 .../.options | 0 .../.project | 0 .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.launching.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.pde.api.tools.prefs | 0 .../.settings/org.eclipse.pde.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- .../about.html | 0 .../build.properties | 0 .../plugin.properties | 0 .../plugin.xml | 0 .../cdtserial/activator/Activator.java | 0 .../cdtserial/connector/SerialConnector.java | 0 .../cdtserial/connector/SerialSettings.java | 0 .../cdtserial/controls/SerialConfigPanel.java | 0 .../controls/SerialSettingsPage.java | 0 .../launcher/SerialLauncherDelegate.java | 0 .../connector/cdtserial/nls/Messages.java | 0 .../cdtserial/nls/Messages.properties | 0 {native => serial}/pom.xml | 2 +- terminal/plugins/pom.xml | 30 ------------------ terminal/pom.xml | 3 +- 71 files changed, 15 insertions(+), 45 deletions(-) rename {native => serial}/org.eclipse.cdt.native.serial/.classpath (100%) rename {native => serial}/org.eclipse.cdt.native.serial/.gitignore (100%) rename {native => serial}/org.eclipse.cdt.native.serial/.project (100%) rename {native => serial}/org.eclipse.cdt.native.serial/.settings/org.eclipse.core.resources.prefs (100%) rename {native => serial}/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.core.prefs (100%) rename {native => serial}/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.launching.prefs (100%) rename {native => serial}/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.ui.prefs (100%) rename {native => serial}/org.eclipse.cdt.native.serial/.settings/org.eclipse.pde.api.tools.prefs (100%) rename {native => serial}/org.eclipse.cdt.native.serial/.settings/org.eclipse.pde.prefs (100%) rename {native => serial}/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF (100%) rename {native => serial}/org.eclipse.cdt.native.serial/about.html (100%) rename {native => serial}/org.eclipse.cdt.native.serial/build.properties (100%) rename {native => serial}/org.eclipse.cdt.native.serial/cdt_logo_icon32.png (100%) rename {native => serial}/org.eclipse.cdt.native.serial/native_src/.gitignore (100%) rename {native => serial}/org.eclipse.cdt.native.serial/native_src/Makefile (100%) rename {native => serial}/org.eclipse.cdt.native.serial/native_src/Readme.md (100%) rename {native => serial}/org.eclipse.cdt.native.serial/native_src/include/org_eclipse_cdt_serial_SerialPort.h (100%) rename {native => serial}/org.eclipse.cdt.native.serial/native_src/serial.c (100%) rename {native => serial}/org.eclipse.cdt.native.serial/os/linux/aarch64/libserial.so (100%) rename {native => serial}/org.eclipse.cdt.native.serial/os/linux/ppc64le/libserial.so (100%) rename {native => serial}/org.eclipse.cdt.native.serial/os/linux/riscv64/libserial.so (100%) rename {native => serial}/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so (100%) rename {native => serial}/org.eclipse.cdt.native.serial/os/macosx/aarch64/libserial.jnilib (100%) rename {native => serial}/org.eclipse.cdt.native.serial/os/macosx/x86_64/libserial.jnilib (100%) rename {native => serial}/org.eclipse.cdt.native.serial/os/win32/aarch64/.gitignore (100%) rename {native => serial}/org.eclipse.cdt.native.serial/os/win32/aarch64/serial.dll (100%) rename {native => serial}/org.eclipse.cdt.native.serial/os/win32/x86_64/.gitignore (100%) rename {native => serial}/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll (100%) rename {native => serial}/org.eclipse.cdt.native.serial/plugin.properties (100%) rename {native => serial}/org.eclipse.cdt.native.serial/pom.xml (99%) rename {native => serial}/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/BaudRate.java (100%) rename {native => serial}/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/ByteSize.java (100%) rename {native => serial}/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/Parity.java (100%) rename {native => serial}/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java (100%) rename {native => serial}/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/StandardBaudRates.java (100%) rename {native => serial}/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/StopBits.java (100%) rename {native => serial}/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/internal/Messages.java (100%) rename {native => serial}/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/internal/messages.properties (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/.classpath (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/.gitignore (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/.options (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/.project (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.core.resources.prefs (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.core.prefs (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.launching.prefs (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.ui.prefs (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.pde.api.tools.prefs (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.pde.prefs (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF (97%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/about.html (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/build.properties (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/plugin.properties (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/plugin.xml (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/activator/Activator.java (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialConnector.java (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialSettings.java (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialConfigPanel.java (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialSettingsPage.java (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/launcher/SerialLauncherDelegate.java (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/nls/Messages.java (100%) rename {terminal/plugins => serial}/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/nls/Messages.properties (100%) rename {native => serial}/pom.xml (93%) delete mode 100644 terminal/plugins/pom.xml diff --git a/BUILDING.md b/BUILDING.md index dc0baf0541e..a9e1ef64b53 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -104,7 +104,7 @@ as access to Eclipse key signing server is needed to sign the jars. #### jniheaders The `jniheaders` profile can be used on the `core/org.eclipse.cdt.core.native` and -`native/org.eclipse.cdt.native.serial` to rebuild the header files for JNI natives. +`serial/org.eclipse.cdt.native.serial` to rebuild the header files for JNI natives. See also `native` property below. ### Properties @@ -177,7 +177,7 @@ Therefore to build all the natives using docker add `-Dnative=docker` to your ma To build only the native libraries `mvn process-resources` can be used on the individual bundles with the simrel target platform, e.g.: -- Serial library: `mvn process-resources -Dnative=docker -DuseSimrelRepo -f native/org.eclipse.cdt.native.serial` +- Serial library: `mvn process-resources -Dnative=docker -DuseSimrelRepo -f serial/org.eclipse.cdt.native.serial` - Core library: `mvn process-resources -Dnative=docker -DuseSimrelRepo -f core/org.eclipse.cdt.core.native` However, the challenge is that dll files on Windows have a timestamp in them. To have reproducible builds, we need to have a reproducible timestamp. As [Microsoft](https://devblogs.microsoft.com/oldnewthing/20180103-00/?p=97705) has moved away from using a timestamp to rather use a hash of the source files as the value, we therefore hash the source files used by the library and the header files for the Java API and use that as the value. diff --git a/Jenkinsfile b/Jenkinsfile index d68d929cec8..4d1b21cac93 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -104,7 +104,7 @@ pipeline { post { always { container('cdt') { - 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/**' + 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/**' junit '*/*/target/surefire-reports/*.xml,terminal/plugins/org.eclipse.tm.terminal.test/target/surefire-reports/*.xml' } } diff --git a/NewAndNoteworthy/README.md b/NewAndNoteworthy/README.md index 4d4d5566d59..aaecddaa66e 100644 --- a/NewAndNoteworthy/README.md +++ b/NewAndNoteworthy/README.md @@ -91,12 +91,12 @@ Especially when writing New & Noteworthy entries about API it is useful to link This should be done using a relative path, such as: ```md -The [SerialPort](../native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java) supports arbitrary baud rates. +The [SerialPort](../serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java) supports arbitrary baud rates. ``` which renders like this: -The [SerialPort](../native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java) supports arbitrary baud rates. +The [SerialPort](../serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java) supports arbitrary baud rates. ### API Changes and Improvements diff --git a/core/org.eclipse.cdt.core.native/native_src/Makefile b/core/org.eclipse.cdt.core.native/native_src/Makefile index 68457ef4de3..75e15be5a08 100644 --- a/core/org.eclipse.cdt.core.native/native_src/Makefile +++ b/core/org.eclipse.cdt.core.native/native_src/Makefile @@ -87,7 +87,7 @@ WIN_TO_SIGN=$(OS_DIR_WIN32_X86_64)/starter.exe \ $(OS_DIR_WIN32_X86_64)/spawner.dll \ $(OS_DIR_WIN32_AARCH64)/starter.exe \ $(OS_DIR_WIN32_AARCH64)/spawner.dll -### This block of code also exists in native/org.eclipse.cdt.native.serial/native_src/Makefile +### This block of code also exists in serial/org.eclipse.cdt.native.serial/native_src/Makefile TMPDIR := $(shell mktemp -d -t production-XXXXXXXXXX) .PHONY: production production: $(MAC_TO_SIGN) $(WIN_TO_SIGN) diff --git a/pom.xml b/pom.xml index 86c62dc0d01..cce7ec9fc86 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,8 @@ memory/org.eclipse.cdt.debug.ui.memory.transport memory/org.eclipse.cdt.debug.ui.memory-feature - native/org.eclipse.cdt.native.serial + serial/org.eclipse.cdt.native.serial + serial/org.eclipse.tm.terminal.connector.cdtserial remote/org.eclipse.cdt.remote.core diff --git a/releng/CDT.setup b/releng/CDT.setup index 916e7d91258..6b8a51c2f0a 100644 --- a/releng/CDT.setup +++ b/releng/CDT.setup @@ -420,11 +420,11 @@ relativePathPattern="memory/.*"/> + name="CDT Serial"> + relativePathPattern="serial/.*"/> diff --git a/releng/scripts/do_rebuild_natives.sh b/releng/scripts/do_rebuild_natives.sh index 93c4463ea09..4d5277c0b94 100755 --- a/releng/scripts/do_rebuild_natives.sh +++ b/releng/scripts/do_rebuild_natives.sh @@ -23,7 +23,7 @@ fi ## # Make sure that natives are up to date ## -for p in native/org.eclipse.cdt.native.serial core/org.eclipse.cdt.core.native; do +for p in serial/org.eclipse.cdt.native.serial core/org.eclipse.cdt.core.native; do echo "Rebuilding $p JNI headers to make sure they match source" logfile=jni-headers-${p//\//-}.log if ! ${MVN:-mvn} -B -V process-resources -P jniheaders -f $p >${logfile} 2>&1; then diff --git a/native/org.eclipse.cdt.native.serial/.classpath b/serial/org.eclipse.cdt.native.serial/.classpath similarity index 100% rename from native/org.eclipse.cdt.native.serial/.classpath rename to serial/org.eclipse.cdt.native.serial/.classpath diff --git a/native/org.eclipse.cdt.native.serial/.gitignore b/serial/org.eclipse.cdt.native.serial/.gitignore similarity index 100% rename from native/org.eclipse.cdt.native.serial/.gitignore rename to serial/org.eclipse.cdt.native.serial/.gitignore diff --git a/native/org.eclipse.cdt.native.serial/.project b/serial/org.eclipse.cdt.native.serial/.project similarity index 100% rename from native/org.eclipse.cdt.native.serial/.project rename to serial/org.eclipse.cdt.native.serial/.project diff --git a/native/org.eclipse.cdt.native.serial/.settings/org.eclipse.core.resources.prefs b/serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from native/org.eclipse.cdt.native.serial/.settings/org.eclipse.core.resources.prefs rename to serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.core.resources.prefs diff --git a/native/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.core.prefs b/serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from native/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.core.prefs rename to serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.core.prefs diff --git a/native/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.launching.prefs b/serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from native/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.launching.prefs rename to serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.launching.prefs diff --git a/native/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.ui.prefs b/serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from native/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.ui.prefs rename to serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.jdt.ui.prefs diff --git a/native/org.eclipse.cdt.native.serial/.settings/org.eclipse.pde.api.tools.prefs b/serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.pde.api.tools.prefs similarity index 100% rename from native/org.eclipse.cdt.native.serial/.settings/org.eclipse.pde.api.tools.prefs rename to serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.pde.api.tools.prefs diff --git a/native/org.eclipse.cdt.native.serial/.settings/org.eclipse.pde.prefs b/serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.pde.prefs similarity index 100% rename from native/org.eclipse.cdt.native.serial/.settings/org.eclipse.pde.prefs rename to serial/org.eclipse.cdt.native.serial/.settings/org.eclipse.pde.prefs diff --git a/native/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF b/serial/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF similarity index 100% rename from native/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF rename to serial/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF diff --git a/native/org.eclipse.cdt.native.serial/about.html b/serial/org.eclipse.cdt.native.serial/about.html similarity index 100% rename from native/org.eclipse.cdt.native.serial/about.html rename to serial/org.eclipse.cdt.native.serial/about.html diff --git a/native/org.eclipse.cdt.native.serial/build.properties b/serial/org.eclipse.cdt.native.serial/build.properties similarity index 100% rename from native/org.eclipse.cdt.native.serial/build.properties rename to serial/org.eclipse.cdt.native.serial/build.properties diff --git a/native/org.eclipse.cdt.native.serial/cdt_logo_icon32.png b/serial/org.eclipse.cdt.native.serial/cdt_logo_icon32.png similarity index 100% rename from native/org.eclipse.cdt.native.serial/cdt_logo_icon32.png rename to serial/org.eclipse.cdt.native.serial/cdt_logo_icon32.png diff --git a/native/org.eclipse.cdt.native.serial/native_src/.gitignore b/serial/org.eclipse.cdt.native.serial/native_src/.gitignore similarity index 100% rename from native/org.eclipse.cdt.native.serial/native_src/.gitignore rename to serial/org.eclipse.cdt.native.serial/native_src/.gitignore diff --git a/native/org.eclipse.cdt.native.serial/native_src/Makefile b/serial/org.eclipse.cdt.native.serial/native_src/Makefile similarity index 100% rename from native/org.eclipse.cdt.native.serial/native_src/Makefile rename to serial/org.eclipse.cdt.native.serial/native_src/Makefile diff --git a/native/org.eclipse.cdt.native.serial/native_src/Readme.md b/serial/org.eclipse.cdt.native.serial/native_src/Readme.md similarity index 100% rename from native/org.eclipse.cdt.native.serial/native_src/Readme.md rename to serial/org.eclipse.cdt.native.serial/native_src/Readme.md diff --git a/native/org.eclipse.cdt.native.serial/native_src/include/org_eclipse_cdt_serial_SerialPort.h b/serial/org.eclipse.cdt.native.serial/native_src/include/org_eclipse_cdt_serial_SerialPort.h similarity index 100% rename from native/org.eclipse.cdt.native.serial/native_src/include/org_eclipse_cdt_serial_SerialPort.h rename to serial/org.eclipse.cdt.native.serial/native_src/include/org_eclipse_cdt_serial_SerialPort.h diff --git a/native/org.eclipse.cdt.native.serial/native_src/serial.c b/serial/org.eclipse.cdt.native.serial/native_src/serial.c similarity index 100% rename from native/org.eclipse.cdt.native.serial/native_src/serial.c rename to serial/org.eclipse.cdt.native.serial/native_src/serial.c diff --git a/native/org.eclipse.cdt.native.serial/os/linux/aarch64/libserial.so b/serial/org.eclipse.cdt.native.serial/os/linux/aarch64/libserial.so similarity index 100% rename from native/org.eclipse.cdt.native.serial/os/linux/aarch64/libserial.so rename to serial/org.eclipse.cdt.native.serial/os/linux/aarch64/libserial.so diff --git a/native/org.eclipse.cdt.native.serial/os/linux/ppc64le/libserial.so b/serial/org.eclipse.cdt.native.serial/os/linux/ppc64le/libserial.so similarity index 100% rename from native/org.eclipse.cdt.native.serial/os/linux/ppc64le/libserial.so rename to serial/org.eclipse.cdt.native.serial/os/linux/ppc64le/libserial.so diff --git a/native/org.eclipse.cdt.native.serial/os/linux/riscv64/libserial.so b/serial/org.eclipse.cdt.native.serial/os/linux/riscv64/libserial.so similarity index 100% rename from native/org.eclipse.cdt.native.serial/os/linux/riscv64/libserial.so rename to serial/org.eclipse.cdt.native.serial/os/linux/riscv64/libserial.so diff --git a/native/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so b/serial/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so similarity index 100% rename from native/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so rename to serial/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so diff --git a/native/org.eclipse.cdt.native.serial/os/macosx/aarch64/libserial.jnilib b/serial/org.eclipse.cdt.native.serial/os/macosx/aarch64/libserial.jnilib similarity index 100% rename from native/org.eclipse.cdt.native.serial/os/macosx/aarch64/libserial.jnilib rename to serial/org.eclipse.cdt.native.serial/os/macosx/aarch64/libserial.jnilib diff --git a/native/org.eclipse.cdt.native.serial/os/macosx/x86_64/libserial.jnilib b/serial/org.eclipse.cdt.native.serial/os/macosx/x86_64/libserial.jnilib similarity index 100% rename from native/org.eclipse.cdt.native.serial/os/macosx/x86_64/libserial.jnilib rename to serial/org.eclipse.cdt.native.serial/os/macosx/x86_64/libserial.jnilib diff --git a/native/org.eclipse.cdt.native.serial/os/win32/aarch64/.gitignore b/serial/org.eclipse.cdt.native.serial/os/win32/aarch64/.gitignore similarity index 100% rename from native/org.eclipse.cdt.native.serial/os/win32/aarch64/.gitignore rename to serial/org.eclipse.cdt.native.serial/os/win32/aarch64/.gitignore diff --git a/native/org.eclipse.cdt.native.serial/os/win32/aarch64/serial.dll b/serial/org.eclipse.cdt.native.serial/os/win32/aarch64/serial.dll similarity index 100% rename from native/org.eclipse.cdt.native.serial/os/win32/aarch64/serial.dll rename to serial/org.eclipse.cdt.native.serial/os/win32/aarch64/serial.dll diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/.gitignore b/serial/org.eclipse.cdt.native.serial/os/win32/x86_64/.gitignore similarity index 100% rename from native/org.eclipse.cdt.native.serial/os/win32/x86_64/.gitignore rename to serial/org.eclipse.cdt.native.serial/os/win32/x86_64/.gitignore diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll b/serial/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll similarity index 100% rename from native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll rename to serial/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll diff --git a/native/org.eclipse.cdt.native.serial/plugin.properties b/serial/org.eclipse.cdt.native.serial/plugin.properties similarity index 100% rename from native/org.eclipse.cdt.native.serial/plugin.properties rename to serial/org.eclipse.cdt.native.serial/plugin.properties diff --git a/native/org.eclipse.cdt.native.serial/pom.xml b/serial/org.eclipse.cdt.native.serial/pom.xml similarity index 99% rename from native/org.eclipse.cdt.native.serial/pom.xml rename to serial/org.eclipse.cdt.native.serial/pom.xml index 71bcde43c2a..e1522fac84e 100644 --- a/native/org.eclipse.cdt.native.serial/pom.xml +++ b/serial/org.eclipse.cdt.native.serial/pom.xml @@ -86,7 +86,7 @@ - + diff --git a/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/BaudRate.java b/serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/BaudRate.java similarity index 100% rename from native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/BaudRate.java rename to serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/BaudRate.java diff --git a/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/ByteSize.java b/serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/ByteSize.java similarity index 100% rename from native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/ByteSize.java rename to serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/ByteSize.java diff --git a/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/Parity.java b/serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/Parity.java similarity index 100% rename from native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/Parity.java rename to serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/Parity.java diff --git a/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java b/serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java similarity index 100% rename from native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java rename to serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/SerialPort.java diff --git a/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/StandardBaudRates.java b/serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/StandardBaudRates.java similarity index 100% rename from native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/StandardBaudRates.java rename to serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/StandardBaudRates.java diff --git a/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/StopBits.java b/serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/StopBits.java similarity index 100% rename from native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/StopBits.java rename to serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/StopBits.java diff --git a/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/internal/Messages.java b/serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/internal/Messages.java similarity index 100% rename from native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/internal/Messages.java rename to serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/internal/Messages.java diff --git a/native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/internal/messages.properties b/serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/internal/messages.properties similarity index 100% rename from native/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/internal/messages.properties rename to serial/org.eclipse.cdt.native.serial/src/org/eclipse/cdt/serial/internal/messages.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.classpath b/serial/org.eclipse.tm.terminal.connector.cdtserial/.classpath similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.classpath rename to serial/org.eclipse.tm.terminal.connector.cdtserial/.classpath diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.gitignore b/serial/org.eclipse.tm.terminal.connector.cdtserial/.gitignore similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.gitignore rename to serial/org.eclipse.tm.terminal.connector.cdtserial/.gitignore diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.options b/serial/org.eclipse.tm.terminal.connector.cdtserial/.options similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.options rename to serial/org.eclipse.tm.terminal.connector.cdtserial/.options diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.project b/serial/org.eclipse.tm.terminal.connector.cdtserial/.project similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.project rename to serial/org.eclipse.tm.terminal.connector.cdtserial/.project diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.core.resources.prefs b/serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.core.resources.prefs rename to serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.core.resources.prefs diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.core.prefs b/serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.core.prefs rename to serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.core.prefs diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.launching.prefs b/serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.launching.prefs rename to serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.launching.prefs diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.ui.prefs b/serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.ui.prefs rename to serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.jdt.ui.prefs diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.pde.api.tools.prefs b/serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.pde.api.tools.prefs similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.pde.api.tools.prefs rename to serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.pde.api.tools.prefs diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.pde.prefs b/serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.pde.prefs similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.pde.prefs rename to serial/org.eclipse.tm.terminal.connector.cdtserial/.settings/org.eclipse.pde.prefs diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF b/serial/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF similarity index 97% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF rename to serial/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF index 0da289512c4..43e2b7bee9c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF +++ b/serial/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.connector.cdtserial;singleton:=true -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.0.100.qualifier Bundle-Activator: org.eclipse.tm.terminal.connector.cdtserial.activator.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/about.html b/serial/org.eclipse.tm.terminal.connector.cdtserial/about.html similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/about.html rename to serial/org.eclipse.tm.terminal.connector.cdtserial/about.html diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/build.properties b/serial/org.eclipse.tm.terminal.connector.cdtserial/build.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/build.properties rename to serial/org.eclipse.tm.terminal.connector.cdtserial/build.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/plugin.properties b/serial/org.eclipse.tm.terminal.connector.cdtserial/plugin.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/plugin.properties rename to serial/org.eclipse.tm.terminal.connector.cdtserial/plugin.properties diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/plugin.xml b/serial/org.eclipse.tm.terminal.connector.cdtserial/plugin.xml similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/plugin.xml rename to serial/org.eclipse.tm.terminal.connector.cdtserial/plugin.xml diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/activator/Activator.java b/serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/activator/Activator.java similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/activator/Activator.java rename to serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/activator/Activator.java diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialConnector.java b/serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialConnector.java similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialConnector.java rename to serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialConnector.java diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialSettings.java b/serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialSettings.java similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialSettings.java rename to serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/connector/SerialSettings.java diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialConfigPanel.java b/serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialConfigPanel.java similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialConfigPanel.java rename to serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialConfigPanel.java diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialSettingsPage.java b/serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialSettingsPage.java similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialSettingsPage.java rename to serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/controls/SerialSettingsPage.java diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/launcher/SerialLauncherDelegate.java b/serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/launcher/SerialLauncherDelegate.java similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/launcher/SerialLauncherDelegate.java rename to serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/launcher/SerialLauncherDelegate.java diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/nls/Messages.java b/serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/nls/Messages.java similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/nls/Messages.java rename to serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/nls/Messages.java diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/nls/Messages.properties b/serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/nls/Messages.properties similarity index 100% rename from terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/nls/Messages.properties rename to serial/org.eclipse.tm.terminal.connector.cdtserial/src/org/eclipse/tm/terminal/connector/cdtserial/nls/Messages.properties diff --git a/native/pom.xml b/serial/pom.xml similarity index 93% rename from native/pom.xml rename to serial/pom.xml index 5d0d12c6744..509cb919cf9 100644 --- a/native/pom.xml +++ b/serial/pom.xml @@ -20,6 +20,6 @@ 12.3.0-SNAPSHOT - org.eclipse.cdt.native-parent + org.eclipse.cdt.serial-parent pom diff --git a/terminal/plugins/pom.xml b/terminal/plugins/pom.xml deleted file mode 100644 index 50017da7ff5..00000000000 --- a/terminal/plugins/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.cdt - terminal-parent - 12.3.0-SNAPSHOT - - - org.eclipse.tm.terminal.plugins - - pom - - - org.eclipse.tm.terminal.connector.cdtserial - - diff --git a/terminal/pom.xml b/terminal/pom.xml index ea63b5a33fa..cd4ae0828c9 100644 --- a/terminal/pom.xml +++ b/terminal/pom.xml @@ -25,7 +25,6 @@ TM Terminal, Maven Master - plugins features @@ -44,7 +43,7 @@ ../core/org.eclipse.cdt.core.win32 ../core/org.eclipse.cdt.core.win32.aarch64 ../core/org.eclipse.cdt.core.win32.x86_64 - ../native/org.eclipse.cdt.native.serial + ../serial/org.eclipse.cdt.native.serial ../remote/org.eclipse.remote.core ../remote/org.eclipse.remote.ui ../releng/org.eclipse.cdt.native-feature