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

Build OSGi Starter Kit for all supported platforms.
Unify names of Eclipse products built for Windows.

Author: HannesWell

JenkinsJobs/Builds/build.jenkinsfile

@@ -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
 

eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml

@@ -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.

products/eclipse-platform/build.properties

@@ -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

products/eclipse-sdk/build.properties

@@ -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

products/equinox-starterkit/build.properties

@@ -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

products/equinox-starterkit/pom.xml

@@ -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