Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
4 changes: 2 additions & 2 deletions NewAndNoteworthy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion core/org.eclipse.cdt.core.native/native_src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@
<module>memory/org.eclipse.cdt.debug.ui.memory.transport</module>
<module>memory/org.eclipse.cdt.debug.ui.memory-feature</module>

<module>native/org.eclipse.cdt.native.serial</module>
<module>serial/org.eclipse.cdt.native.serial</module>
<module>serial/org.eclipse.tm.terminal.connector.cdtserial</module>

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

Expand Down
4 changes: 2 additions & 2 deletions releng/CDT.setup
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,11 @@
relativePathPattern="memory/.*"/>
</workingSet>
<workingSet
name="CDT Native">
name="CDT Serial">
<predicate
xsi:type="predicates:RepositoryPredicate"
project="org.eclipse.cdt"
relativePathPattern="native/.*"/>
relativePathPattern="serial/.*"/>
</workingSet>
<workingSet
name="CDT Releng">
Expand Down
2 changes: 1 addition & 1 deletion releng/scripts/do_rebuild_natives.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<arg value="-v" />
<arg value="${project.basedir}/../..:/work" />
<arg value="-w" />
<arg value="/work/native/org.eclipse.cdt.native.serial" />
<arg value="/work/serial/org.eclipse.cdt.native.serial" />
<arg value="quay.io/eclipse-cdt/cdt-infra:latest" />
<arg value="make" />
<arg value="-C" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion native/pom.xml → serial/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<version>12.3.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.cdt.native-parent</artifactId>
<artifactId>org.eclipse.cdt.serial-parent</artifactId>
<packaging>pom</packaging>
</project>
30 changes: 0 additions & 30 deletions terminal/plugins/pom.xml

This file was deleted.

3 changes: 1 addition & 2 deletions terminal/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<name>TM Terminal, Maven Master</name>

<modules>
<module>plugins</module>
<module>features</module>
</modules>
<profiles>
Expand All @@ -44,7 +43,7 @@
<module>../core/org.eclipse.cdt.core.win32</module>
<module>../core/org.eclipse.cdt.core.win32.aarch64</module>
<module>../core/org.eclipse.cdt.core.win32.x86_64</module>
<module>../native/org.eclipse.cdt.native.serial</module>
<module>../serial/org.eclipse.cdt.native.serial</module>
<module>../remote/org.eclipse.remote.core</module>
<module>../remote/org.eclipse.remote.ui</module>
<module>../releng/org.eclipse.cdt.native-feature</module>
Expand Down
Loading