Skip to content

[I/Y-Build] Unify and streamline build and naming of products #3767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HannesWell merged 1 commit into from
Apr 16, 2026
Merged

[I/Y-Build] Unify and streamline build and naming of products #3767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 2 additions & 14 deletions JenkinsJobs/Builds/build.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,25 +274,13 @@ pipeline {
# Gather sdk product
for file in ${PRODUCTS_DIR}/eclipse-sdk/target/products/*; do
if [[ "$file" =~ /org.eclipse.sdk.ide-([^.]+).([^.]+).([^.]+).(.*)$ ]]; then
if [[ "${BASH_REMATCH[1]}" == "${BASH_REMATCH[2]}" ]]; then
#TODO: Remove this special treatment
osWsArch=${BASH_REMATCH[1]}-${BASH_REMATCH[3]}
else
osWsArch=${BASH_REMATCH[1]}-${BASH_REMATCH[2]}-${BASH_REMATCH[3]}
fi
cp ${file} ${DROP_DIR}/${BUILD_ID}/eclipse-SDK-$BUILD_ID-${osWsArch}.${BASH_REMATCH[4]}
cp ${file} ${DROP_DIR}/${BUILD_ID}/eclipse-SDK-$BUILD_ID-${BASH_REMATCH[1]}-${BASH_REMATCH[2]}-${BASH_REMATCH[3]}.${BASH_REMATCH[4]}
fi
done
# Gather platform product
for file in ${PRODUCTS_DIR}/eclipse-platform/target/products/*; do
if [[ "$file" =~ /org.eclipse.platform.ide-([^.]+).([^.]+).([^.]+).(.*)$ ]]; then
if [[ "${BASH_REMATCH[1]}" == "${BASH_REMATCH[2]}" ]]; then
#TODO: Remove this special treatment
osWsArch=${BASH_REMATCH[1]}-${BASH_REMATCH[3]}
else
osWsArch=${BASH_REMATCH[1]}-${BASH_REMATCH[2]}-${BASH_REMATCH[3]}
fi
cp ${file} ${DROP_DIR}/${BUILD_ID}/eclipse-platform-$BUILD_ID-${osWsArch}.${BASH_REMATCH[4]}
cp ${file} ${DROP_DIR}/${BUILD_ID}/eclipse-platform-$BUILD_ID-${BASH_REMATCH[1]}-${BASH_REMATCH[2]}-${BASH_REMATCH[3]}.${BASH_REMATCH[4]}
fi
done

Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<!-- grab the currently built + zipped build -->
<property
name="current_location"
value="${buildDirectory}/eclipse-SDK-${buildLabel}-win32-x86_64.zip" />
value="${buildDirectory}/eclipse-SDK-${buildLabel}-win32-win32-x86_64.zip" />
<!--
If not available, build failed, for other reasons, so we'll prevent
errors from occuring here, which might be confusing in debugging.
Expand Down
2 changes: 1 addition & 1 deletion products/eclipse-platform/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Maven/Tycho pom model adjustments, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
# Maven/Tycho pom model adjustments, see https://github.com/eclipse-tycho/tycho/wiki/Tycho-Pomless
pom.model.property.product.id = org.eclipse.platform.ide
pom.model.property.product.rootFolder = eclipse
pom.model.property.product.rootFolder.macosx = Eclipse.app
Expand Down
2 changes: 1 addition & 1 deletion products/eclipse-sdk/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Maven/Tycho pom model adjustments, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
# Maven/Tycho pom model adjustments, see https://github.com/eclipse-tycho/tycho/wiki/Tycho-Pomless
pom.model.property.product.id = org.eclipse.sdk.ide
pom.model.property.product.rootFolder = eclipse
pom.model.property.product.rootFolder.macosx = Eclipse.app
Expand Down
6 changes: 6 additions & 0 deletions products/equinox-starterkit/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Maven/Tycho pom model adjustments, see https://github.com/eclipse-tycho/tycho/wiki/Tycho-Pomless
pom.model.property.product.id = org.eclipse.rt.osgistarterkit.product
pom.model.property.product.rootFolder = rt
pom.model.property.product.rootFolder.macosx = Rt.app

pom.model.property.eclipse.signing.skip = false
88 changes: 0 additions & 88 deletions products/equinox-starterkit/pom.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion sites/eclipse-platform-repository/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Maven/Tycho pom model adjustments, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
# Maven/Tycho pom model adjustments, see https://github.com/eclipse-tycho/tycho/wiki/Tycho-Pomless
pom.model.property.repository.name = Eclipse ${releaseVersion}
pom.model.property.eclipse.signing.skip = false
Loading