Skip to content

Commit cc66780

Browse files
committed
Cleanup CDT repo related to the docker + Java 21 updates
- Fix links for cdt-infra - The cdt-infra git repo is now archived, so this commit updates the links to the current values. - Add new Docker related files to the gitattributes as text files - Update DEFAULT_BUFFER_SIZE for Java 21's value when building JNI, this also means the dll/exe need a rebuild - add a toolchains.xml since we use Java 21 toolchain, but most bundles are Java 17 still
1 parent 9fb6260 commit cc66780

File tree

21 files changed

+55
-17
lines changed

21 files changed

+55
-17
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ Makefile text
4444
# Build files
4545
*.Jenkinsfile text
4646
Jenkinsfile text
47+
Dockerfile text
4748
*.yaml text
4849
*.yml text
50+
.dockerignore text
51+
uid_entrypoint text
4952

5053
# Qt
5154
*.pro text

BUILDING.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,17 @@ mvn package
1616

1717
and the resulting p2 repository will be in `releng/org.eclipse.cdt.repo/target/repository`
1818

19-
The current set of options to Maven used for building on the CI can be seen in the Jenkinsfiles on [cdt-infra](https://github.com/eclipse-cdt/cdt-infra/tree/master/jenkins/pipelines/cdt)
19+
The current set of options to Maven used for building on the CI can be seen in the [Jenkinsfile](https://github.com/eclipse-cdt/cdt/blob/main/Jenkinsfile) and GitHub actions [workflows](https://github.com/eclipse-cdt/cdt/tree/main/.github/workflows)
2020

21-
To build CDT plug-ins you need a standard Maven & Java developement environment. The Dockerfiles used for CDT's images are published in [cdt-infra](https://github.com/eclipse-cdt/cdt-infra/tree/master/docker). The requirements for running all tests successfully and for rebuilding non-Java parts of CDT are much more extensive than standard Maven & Java and include items such as GCC, GDB, yarn, Node, etc. Refer to the Dockerfiles for the current versions of those dependencies.
21+
To build CDT plug-ins you need a standard Maven & Java development environment. The Dockerfiles used for CDT's images are published in [docker](https://github.com/eclipse-cdt/cdt/tree/main/docker). The requirements for running all tests successfully and for rebuilding non-Java parts of CDT are much more extensive than standard Maven & Java and include items such as GCC, GDB, yarn, Node, etc. Refer to the Dockerfiles for the current versions of those dependencies.
22+
23+
### Checking code cleanliness
24+
25+
The CI build automatically run code cleanliness checks. To run them on your computer it is recommended to use the Docker image, for example like this from the root of the checked out CDT repo:
26+
27+
```sh
28+
docker run --rm -it -v $(git rev-parse --show-toplevel):/work -w /work/$(git rev-parse --show-prefix) --cap-add=SYS_PTRACE --security-opt seccomp=unconfined quay.io/eclipse-cdt/cdt-infra-plus-eclipse-install:latest releng/scripts/check_code_cleanliness.sh
29+
```
2230

2331
### Profiles
2432

@@ -123,7 +131,7 @@ There are a few special values that can be specified (see BaseParametrizedTestCa
123131
The default, defined in the root pom.xml, it is blank, which uses `gdb` and `gdbserver`.
124132
See BaseParametrizedTestCase for more info.
125133

126-
To build all gdb versions for testing CDT see [download-build-gdb.sh](https://github.com/eclipse-cdt/cdt-infra/blob/master/docker/scripts/download-build-gdb.sh)
134+
To build all gdb versions for testing CDT see [download-build-gdb.sh](https://github.com/eclipse-cdt/cdt/blob/main/docker/scripts/download-build-gdb.sh)
127135

128136
#### native
129137

NOTICE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ SPDX-License-Identifier: EPL-2.0
2727

2828
The project maintains the following source code repositories:
2929

30-
* https://github.com/eclipse-cdt/.github
3130
* https://github.com/eclipse-cdt/cdt
32-
* https://github.com/eclipse-cdt/cdt-infra
3331
* https://github.com/eclipse-cdt/cdt-lsp
32+
* https://github.com/eclipse-cdt/.eclipsefdn
33+
* https://github.com/eclipse-cdt/.github
3434

3535
## Cryptography
3636

POLICY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Code Formatting
22

3-
These are the coding style recommendations that are in place with project setting. They are enforced by the [build process](https://github.com/eclipse-cdt/cdt-infra/tree/master/jenkins/pipelines/cdt/verify#cdt-verify-code-cleanliness) and auto-save actions in Eclipse.
3+
These are the coding style recommendations that are in place with project setting. They are enforced by the build process (as defined in [Jenkinsfile](https://github.com/eclipse-cdt/cdt/blob/main/Jenkinsfile) and GitHub actions [workflows](https://github.com/eclipse-cdt/cdt/tree/main/.github/workflows)) and auto-save actions in Eclipse.
44

55
* Preserve formatting and style of old code when making patches
66
* Use default "Eclipse" code formatting for Java for new code
@@ -13,7 +13,7 @@ Externalize strings (excluding exception arguments, tests and special identifier
1313

1414
## Eclipse Java Errors/Warnings
1515

16-
All CDT plugins override default compiler error/warning and use project specific errors/warnings. This enforced by the [build process](https://github.com/eclipse-cdt/cdt-infra/tree/master/jenkins/pipelines/cdt/verify#cdt-verify-code-cleanliness).
16+
All CDT plugins override default compiler error/warning and use project specific errors/warnings. This enforced by the build process (as defined in [Jenkinsfile](https://github.com/eclipse-cdt/cdt/blob/main/Jenkinsfile) and GitHub actions [workflows](https://github.com/eclipse-cdt/cdt/tree/main/.github/workflows)).
1717

1818
All committers and contributors submitting patches should enable [API tooling](http://wiki.eclipse.org/PDE/API_Tools/User_Guide#API_Tooling_Setup) by setting target baseline platform. Do not commit code with API errors.
1919

core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.cdt.core.native;singleton:=true
5-
Bundle-Version: 6.3.300.qualifier
5+
Bundle-Version: 6.3.400.qualifier
66
Bundle-Activator: org.eclipse.cdt.internal.core.natives.CNativePlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

core/org.eclipse.cdt.core.native/native_src/include/org_eclipse_cdt_utils_pty_PTYInputStream.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/org.eclipse.cdt.core.native/native_src/include/org_eclipse_cdt_utils_spawner_SpawnerInputStream.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/org.eclipse.cdt.core.native/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<relativePath>../../pom.xml</relativePath>
2424
</parent>
2525

26-
<version>6.3.300-SNAPSHOT</version>
26+
<version>6.3.400-SNAPSHOT</version>
2727
<artifactId>org.eclipse.cdt.core.native</artifactId>
2828
<packaging>eclipse-plugin</packaging>
2929

Binary file not shown.
Binary file not shown.
Binary file not shown.

docker/cdt-infra-base/ubuntu-18.04/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ RUN export JVERSION=${JDK17_VERSION} \
117117
&& find $JHOME/include \
118118
&& rm -rf /tmp/x
119119

120-
121120
# Default to JAVA21 being in use
122121
ENV PATH="${JAVA21_HOME}/bin:${PATH}"
123122
ENV JAVA_HOME ${JAVA21_HOME}
@@ -129,6 +128,8 @@ RUN curl -fsSL https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/bina
129128
&& ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
130129
ENV MAVEN_HOME /usr/share/maven
131130

131+
RUN mkdir -p ${HOME}/.m2
132+
COPY toolchains.xml ${HOME}/.m2
132133

133134
#Fix permissions for OpenShift & standard k8s
134135
RUN chown -R 1000:0 ${HOME} \

docker/cdt-infra-eclipse-full/ubuntu-18.04/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
3737
RUN pip3 install meson
3838

3939
# GDB pre-built in a different image
40-
COPY --from=cdt-infra-all-gdbs:ubuntu-18.04 /shared/common/gdb/gdb-all /shared/common/gdb/gdb-all
40+
COPY --from=cdt-infra-all-gdbs:ubuntu-18.04 /shared/common/gdb/gdb-all/bin /shared/common/gdb/gdb-all/bin
41+
COPY --from=cdt-infra-all-gdbs:ubuntu-18.04 /shared/common/gdb/gdb-all/install /shared/common/gdb/gdb-all/install
4142
ENV PATH="/shared/common/gdb/gdb-all/bin:${PATH}"
4243

4344
# Get pre-built MacOSX toolchain from other image (this also

docker/scripts/xstartup_icewm.sh

100644100755
File mode changed.

docker/scripts/xstartup_metacity.sh

100644100755
File mode changed.

docker/scripts/xstartup_mutter.sh

100644100755
File mode changed.

docker/toolchains.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF8"?>
2+
<toolchains>
3+
<toolchain>
4+
<type>jdk</type>
5+
<provides>
6+
<id>JavaSE-21</id>
7+
<version>21</version>
8+
<vendor>default</vendor>
9+
</provides>
10+
<configuration>
11+
<jdkHome>/usr/lib/jvm/jdk-21.0.3+9</jdkHome>
12+
</configuration>
13+
</toolchain>
14+
<toolchain>
15+
<type>jdk</type>
16+
<provides>
17+
<id>JavaSE-17</id>
18+
<version>17</version>
19+
<vendor>default</vendor>
20+
</provides>
21+
<configuration>
22+
<jdkHome>/usr/lib/jvm/jdk-17.0.11+9</jdkHome>
23+
</configuration>
24+
</toolchain>
25+
</toolchains>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22

3-
echo "This script, part of CDT's infrastructure, has been moved to https://github.com/eclipse-cdt/cdt-infra/blob/master/docker/scripts/download-build-gdb.sh"
3+
echo "This script, part of CDT's infrastructure, has been moved to https://github.com/eclipse-cdt/cdt/blob/main/docker/scripts/download-build-gdb.sh"

dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.cdt.examples.dsf;singleton:=true
6-
Bundle-Version: 2.4.200.qualifier
6+
Bundle-Version: 2.4.300.qualifier
77
Bundle-Activator: org.eclipse.cdt.examples.dsf.DsfExamplesPlugin
88
Bundle-Localization: plugin
99
Require-Bundle: org.eclipse.ui,
Binary file not shown.

releng/scripts/do_format_code.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ CDTDIR=${DIR}/../..
2323
##
2424
# Format code
2525
##
26-
: ${ECLIPSE:=~/buildtools/eclipse-SDK-4.23/eclipse}
26+
: ${ECLIPSE:=~/buildtools/eclipse-SDK-4.31/eclipse}
2727

2828
if test ! -e "$ECLIPSE" ; then
2929
echo "The Eclipse binary was not found at \"$ECLIPSE\"!"
3030
echo "You can download it to and pass it via environment variable:"
31-
echo " curl -L http://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/eclipse-SDK-4.23-linux-gtk-x86_64.tar.gz | tar xzC /tmp"
31+
echo " curl -L https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/eclipse-SDK-4.31-linux-gtk-x86_64.tar.gz | tar xzC /tmp"
3232
echo " ECLIPSE=/tmp/eclipse/eclipse ./releng/scripts/check_code_cleanliness.sh"
3333
exit 1
3434
fi

0 commit comments

Comments
 (0)