Merge branch 'eclipse-platform:master' into master

Author: ShahzaibIbrahim

Jenkinsfile

@@ -17,9 +17,18 @@
 
 def runOnNativeBuildAgent(String platform, Closure body) {
 	def final nativeBuildStageName = 'Build SWT-native binaries'
-	if (platform == 'gtk.linux.x86_64') {
+	def dockerImage = null
+	switch (platform) {
+		case 'gtk.linux.x86_64':
+			dockerImage = 'eclipse/platformreleng-debian-swtgtk3nativebuild:10'
+			break
+		case 'gtk4.linux.x86_64':
+			dockerImage = 'eclipse/platformreleng-debian-swtnativebuild:12'
+			break
+	}
+	if (dockerImage != null) {
 		podTemplate(inheritFrom: 'basic' /* inherit general configuration */, containers: [
-			containerTemplate(name: 'swtbuild', image: 'eclipse/platformreleng-debian-swtnativebuild:12',
+			containerTemplate(name: 'swtbuild', image: dockerImage,
 				resourceRequestCpu:'1000m', resourceRequestMemory:'512Mi',
 				resourceLimitCpu:'2000m', resourceLimitMemory:'4096Mi',
 				alwaysPullImage: true, command: 'cat', ttyEnabled: true)
@@ -199,6 +208,7 @@ pipeline {
 						'gtk.linux.ppc64le',\
 						'gtk.linux.riscv64',\
 						'gtk.linux.x86_64',\
+						'gtk4.linux.x86_64',\
 						'win32.win32.aarch64',\
 						'win32.win32.x86_64'
 					}
@@ -220,22 +230,29 @@ pipeline {
 								runOnNativeBuildAgent("${PLATFORM}") {
 									cleanWs() // Workspace is not cleaned up by default, so we do it explicitly
 									echo "OS: ${os}, ARCH: ${arch}"
-									unstash "swt.binaries.sources.${ws}"
+									unstash "swt.binaries.sources.${ws == 'gtk4' ? 'gtk' : ws }"
 									dir('jdk.resources') {
 										unstash "jdk.resources.${os}.${arch}"
 									}
 									withEnv(['MODEL=' + arch, "OUTPUT_DIR=${WORKSPACE}/libs", "SWT_JAVA_HOME=${WORKSPACE}/jdk.resources"]) {
 										if (isUnix()){
-											sh '''
+											sh '''#!/bin/bash -x
 												mkdir libs
-												if [ "${PLATFORM}" = "gtk.linux.aarch64" ]; then
-													sh build.sh -gtk3 install
-												elif [ "${PLATFORM}" = "gtk.linux.ppc64le" ]; then
-													sh build.sh -gtk3 install
-												elif [ "${PLATFORM}" = "gtk.linux.riscv64" ]; then
-													sh build.sh -gtk3 install
-												else
+												if [[ ${PLATFORM} == gtk.linux.* ]]; then
+													sh build.sh -gtk3 checklibs install
+												elif [[ ${PLATFORM} == gtk4.linux.* ]]; then
+													# We build both 3 + 4, but we only keep libswt-pi4-gtk
+													# We build both to help catch build errors as this
+													# build runs against more modern gcc/libs and helps
+													# with verification
+													sh build.sh -gtk3 checklibs
+													sh build.sh clean
+													sh build.sh -gtk4 checklibs install-pi-only
+												elif [[ ${PLATFORM} == cocoa.macosx.* ]]; then
 													sh build.sh install 
+												else
+													echo "Unexpected build platform ${PLATFORM}"
+													exit 1
 												fi
 												ls -1R libs
 											'''
@@ -258,12 +275,14 @@ pipeline {
 						steps {
 							dir("libs/${PLATFORM}") {
 								unstash "swt.binaries.${PLATFORM}"
-								sh '''
+								sh '''#!/bin/bash -x
 									if [[ ${PLATFORM} == cocoa.macosx.* ]]; then
 										binariesExtension='jnilib'
 										signerUrl='https://cbi.eclipse.org/macos/codesign/sign'
-									elif [[ ${PLATFORM} == gtk.linux.* ]]; then
+									elif [[ ${PLATFORM} == gtk.linux.* || ${PLATFORM} == gtk4.linux.* ]]; then
 										binariesExtension='so'
+										# Replace 'gtk4' by 'gtk' to copy the built gtk4 library into gtk fragment
+										PLATFORM=${PLATFORM/#gtk4/gtk}
 									elif [[ ${PLATFORM} == win32.win32.* ]]; then
 										binariesExtension='dll'
 										signerUrl='https://cbi.eclipse.org/authenticode/sign'
@@ -326,7 +345,7 @@ pipeline {
 			post {
 				always {
 					junit 'eclipse.platform.swt/tests/*.test*/target/surefire-reports/*.xml'
-					archiveArtifacts artifacts: '**/*.log,**/*.html,**/target/*.jar,**/target/*.zip'
+					archiveArtifacts artifacts: '**/*.log,*/binaries/*/target/*.jar', excludes: '**/*-sources.jar'
 					discoverGitReferenceBuild referenceJob: 'eclipse.platform.swt/master'
 					// To accept unstable builds (test errors or new warnings introduced by third party changes) as reference using "ignoreQualityGate:true"
 					recordIssues publishAllIssues: true, ignoreQualityGate:true, tools: [eclipse(name: 'Compiler and API Tools', pattern: '**/target/compilelogs/*.xml'), javaDoc()], qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-awt-cocoa-4968r11.jnilib

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11b336d528211296817b66ca6829a6b6d17013c9da09ef9357b976a9a277acfb
+size 51952

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-awt-cocoa-4968r8.jnilib

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61674b51e612822f15b0589cc983b888800fdecbd9b8fe560545ff062ca9fd61
+size 576624

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-cocoa-4968r11.jnilib

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8d445aca3572e0f26e7ab7c49e264e3e5301ded6952ef3f9c05a9f0f7724f7e
+size 298864

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-cocoa-4968r8.jnilib

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfdc5a08fb5b7b9101f3efd96d86d4c285cd196112e51a234b34c92e41efe59c
+size 52352

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-pi-cocoa-4968r11.jnilib

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72536bd481c8357ef282ece6419e004bd7d271db30ee60736e2ab1b07460029e
+size 514256