diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc43a02f93a..62f4a696e46 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,9 +28,9 @@ jobs: - name: checkout equinox.binaries uses: actions/checkout@v4 with: - fetch-depth: 1 # only shallow here, we don't have jgit timestamps - repository: eclipse-equinox/equinox.binaries - path: rt.equinox.binaries + fetch-depth: 1 # only shallow here, we don't have jgit timestamps + repository: eclipse-equinox/equinox.binaries + path: equinox.binaries - name: Set up JDK 17 uses: actions/setup-java@v4 with: @@ -54,7 +54,7 @@ jobs: - name: Build with Maven uses: coactions/setup-xvfb@v1 env: - EQUINOX_BINARIES_LOC: ${{ github.workspace }}/rt.equinox.binaries + EQUINOX_BINARIES_LOC: ${{ github.workspace }}/equinox.binaries with: working-directory: equinox run: >- @@ -65,7 +65,7 @@ jobs: -Dcompare-version-with-baselines.skip=false -Dmaven.test.failure.ignore=true -Dnative=${{ matrix.config.ws }}.${{ matrix.config.os }}.x86_64 - -Drt.equinox.binaries.loc=${{ github.workspace }}/rt.equinox.binaries + -Dequinox.binaries.loc=${{ github.workspace }}/equinox.binaries clean verify - name: Upload native artifacts uses: actions/upload-artifact@v4 @@ -73,8 +73,8 @@ jobs: with: name: ${{ matrix.config.name }} launcher artifacts path: | - rt.equinox.binaries/org.eclipse.equinox.executable/bin/${{ matrix.config.ws }}/${{ matrix.config.os }}/x86_64/**/eclipse* - rt.equinox.binaries/org.eclipse.equinox.launcher.${{ matrix.config.ws }}.${{ matrix.config.os }}.x86_64/eclipse_*.${{ matrix.config.native-extension }} + equinox.binaries/org.eclipse.equinox.executable/bin/${{ matrix.config.ws }}/${{ matrix.config.os }}/x86_64/**/eclipse* + equinox.binaries/org.eclipse.equinox.launcher.${{ matrix.config.ws }}.${{ matrix.config.os }}.x86_64/eclipse_*.${{ matrix.config.native-extension }} if-no-files-found: error - name: Upload ${{ matrix.config.name }} Test Results uses: actions/upload-artifact@v4 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 530cf3600fc..3f111b8fadb 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -38,7 +38,7 @@ jobs: with: fetch-depth: 1 # only shallow here, we don't have jgit timestamps repository: eclipse-equinox/equinox.binaries - path: rt.equinox.binaries + path: equinox.binaries # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3 @@ -69,7 +69,7 @@ jobs: -Papi-check -Dcompare-version-with-baselines.skip=false -Dmaven.test.failure.ignore=true - -Drt.equinox.binaries.loc=${{ github.workspace }}/rt.equinox.binaries + -Dequinox.binaries.loc=${{ github.workspace }}/equinox.binaries -DskipTests=true clean verify diff --git a/Jenkinsfile b/Jenkinsfile index 7f69b6b45b8..733fc200ae2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -323,7 +323,7 @@ pipeline { sh ''' mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \ -Pbree-libs -Papi-check -Pjavadoc\ - -Drt.equinox.binaries.loc=$WORKSPACE/equinox.binaries + -Dequinox.binaries.loc=$WORKSPACE/equinox.binaries ''' } } diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh index 400df43e356..2996497b014 100755 --- a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh @@ -62,7 +62,7 @@ PROGRAM_OUTPUT="$programOutput" DEFAULT_OS="$defaultOS" DEFAULT_WS="$defaultWS" DEPLOYMENT_TARGET=11.0 -if [ "$BINARIES_DIR" = "" ]; then BINARIES_DIR="../../../../../rt.equinox.binaries"; fi +if [ "$BINARIES_DIR" = "" ]; then BINARIES_DIR="../../../../../equinox.binaries"; fi if [ "$defaultOSArch" == "arm64" ] || [ "$defaultOSArch" == "aarch64" ] then diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh index 3da0cf94c77..2111536e691 100755 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh @@ -39,7 +39,7 @@ programOutput="eclipse" defaultOS="" defaultOSArch="" defaultWS="gtk" -if [ "$BINARIES_DIR" = "" ]; then BINARIES_DIR="../../../../../rt.equinox.binaries"; fi +if [ "$BINARIES_DIR" = "" ]; then BINARIES_DIR="../../../../../equinox.binaries"; fi defaultJava=DEFAULT_JAVA_JNI defaultJavaHome="" javaHome="" diff --git a/features/org.eclipse.equinox.executable.feature/library/win32/build.bat b/features/org.eclipse.equinox.executable.feature/library/win32/build.bat index ed06eade057..6c62c901243 100644 --- a/features/org.eclipse.equinox.executable.feature/library/win32/build.bat +++ b/features/org.eclipse.equinox.executable.feature/library/win32/build.bat @@ -151,7 +151,7 @@ set DEFAULT_OS=%defaultOS% set DEFAULT_OS_ARCH=%defaultOSArch% set DEFAULT_WS=%defaultWS% set JAVA_HOME=%javaHome% -IF "%BINARIES_DIR%"=="" set "BINARIES_DIR=..\..\..\..\..\rt.equinox.binaries" +IF "%BINARIES_DIR%"=="" set "BINARIES_DIR=..\..\..\..\..\equinox.binaries" IF "%EXE_OUTPUT_DIR%"=="" set "EXE_OUTPUT_DIR=%BINARIES_DIR%\org.eclipse.equinox.executable\bin\%defaultWS%\%defaultOS%\%defaultOSArch%" IF "%LIB_OUTPUT_DIR%"=="" set "LIB_OUTPUT_DIR=%BINARIES_DIR%\org.eclipse.equinox.launcher.%defaultWS%.%defaultOS%.%defaultOSArch%" diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml index 9733bfde27f..5ad535f598d 100644 --- a/features/org.eclipse.equinox.executable.feature/pom.xml +++ b/features/org.eclipse.equinox.executable.feature/pom.xml @@ -119,7 +119,7 @@ them --> - + diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml index 837a3f06330..bc7db3d1f2e 100644 --- a/launcher-binary-parent/pom.xml +++ b/launcher-binary-parent/pom.xml @@ -42,7 +42,7 @@ - ${rt.equinox.binaries.loc}/${project.artifactId} + ${equinox.binaries.loc}/${project.artifactId} *.so *.dll diff --git a/pom.xml b/pom.xml index 7c810a9cf5d..7b506ffd83d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,10 +25,10 @@ scm:git:https://github.com/eclipse-equinox/equinox.git - + - ../../../rt.equinox.binaries + ../../../equinox.binaries require