From 9cdcee51a79a3f72e10e074b87326f80d3d6ada2 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Tue, 2 Jan 2024 16:04:41 +0100 Subject: [PATCH] [Build] Leverage Tycho Pomless --- .gitignore | 2 ++ .mvn/extensions.xml | 9 +++++ .mvn/maven.config | 1 + Jenkinsfile | 4 +-- .../build.properties | 10 +++++- .../pom.xml | 34 ------------------- .../build.properties | 10 +++++- .../pom.xml | 34 ------------------- .../build.properties | 10 +++++- .../org.eclipse.swt.gtk.linux.aarch64/pom.xml | 34 ------------------- .../build.properties | 10 +++++- .../pom.xml | 34 ------------------- .../build.properties | 10 +++++- .../org.eclipse.swt.gtk.linux.ppc64le/pom.xml | 34 ------------------- .../build.properties | 10 +++++- .../org.eclipse.swt.gtk.linux.x86_64/pom.xml | 34 ------------------- .../build.properties | 10 +++++- .../pom.xml | 34 ------------------- 18 files changed, 77 insertions(+), 247 deletions(-) create mode 100644 .mvn/extensions.xml create mode 100644 .mvn/maven.config delete mode 100644 bundles/org.eclipse.swt.cocoa.macosx.aarch64/pom.xml delete mode 100644 bundles/org.eclipse.swt.cocoa.macosx.x86_64/pom.xml delete mode 100644 bundles/org.eclipse.swt.gtk.linux.aarch64/pom.xml delete mode 100644 bundles/org.eclipse.swt.gtk.linux.loongarch64/pom.xml delete mode 100644 bundles/org.eclipse.swt.gtk.linux.ppc64le/pom.xml delete mode 100644 bundles/org.eclipse.swt.gtk.linux.x86_64/pom.xml delete mode 100644 bundles/org.eclipse.swt.win32.win32.x86_64/pom.xml diff --git a/.gitignore b/.gitignore index 701376c431..d930e11c06 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ src/ target/ tmpdir/ +.polyglot.* +pom.tycho diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000000..7325b2d443 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,9 @@ + + + + + org.eclipse.tycho + tycho-build + 4.0.4 + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000000..26de1a8fe7 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Pbuild-individual-bundles diff --git a/Jenkinsfile b/Jenkinsfile index 35446bceaa..c5db58f859 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -105,7 +105,7 @@ spec: sh ''' /opt/tools/apache-maven/latest/bin/mvn install \ --batch-mode --no-transfer-progress \ - -Pbuild-individual-bundles -DforceContextQualifier=zzz -Dnative=gtk.linux.x86_64 \ + -DforceContextQualifier=zzz -Dnative=gtk.linux.x86_64 \ -Dcompare-version-with-baselines.skip=true -Dmaven.compiler.failOnWarning=true ''' } @@ -113,7 +113,7 @@ spec: sh ''' /opt/tools/apache-maven/latest/bin/mvn clean verify \ --batch-mode --no-transfer-progress \ - -Pbuild-individual-bundles -DcheckAllWS=true -DforkCount=0 \ + -DcheckAllWS=true -DforkCount=0 \ -Dcompare-version-with-baselines.skip=false -Dmaven.compiler.failOnWarning=true \ -Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true ''' diff --git a/bundles/org.eclipse.swt.cocoa.macosx.aarch64/build.properties b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/build.properties index 3b26aa7b3f..deeffc9861 100644 --- a/bundles/org.eclipse.swt.cocoa.macosx.aarch64/build.properties +++ b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2012 IBM Corporation and others. +# Copyright (c) 2000, 2024 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,9 +8,17 @@ # Contributors: # IBM Corporation - initial API and implementation # Krzysztof Daniel, Red Hat, Inc. - tycho enablement +# Hannes Wellmann - Leverage Tycho pomless ############################################################################### custom = true bin.includes = .,*.jnilib,about_files/,about.html,fragment.properties bin.excludes = library/ source.. = src/ src.includes = about.html,about_files/ + +tycho.pomless.parent=../binaries-parent +pom.model.groupId=org.eclipse.swt +pom.model.property.os=macosx +pom.model.property.ws=cocoa +pom.model.property.arch=aarch64 +pom.model.property.targets= diff --git a/bundles/org.eclipse.swt.cocoa.macosx.aarch64/pom.xml b/bundles/org.eclipse.swt.cocoa.macosx.aarch64/pom.xml deleted file mode 100644 index 3b6229686c..0000000000 --- a/bundles/org.eclipse.swt.cocoa.macosx.aarch64/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - binaries-parent - eclipse.platform.swt.binaries - 4.31.0-SNAPSHOT - ../binaries-parent/ - - org.eclipse.swt - org.eclipse.swt.cocoa.macosx.aarch64 - 3.125.0-SNAPSHOT - eclipse-plugin - - - macosx - cocoa - aarch64 - - - - diff --git a/bundles/org.eclipse.swt.cocoa.macosx.x86_64/build.properties b/bundles/org.eclipse.swt.cocoa.macosx.x86_64/build.properties index 3b26aa7b3f..9c5ef7a84e 100644 --- a/bundles/org.eclipse.swt.cocoa.macosx.x86_64/build.properties +++ b/bundles/org.eclipse.swt.cocoa.macosx.x86_64/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2012 IBM Corporation and others. +# Copyright (c) 2000, 2024 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,9 +8,17 @@ # Contributors: # IBM Corporation - initial API and implementation # Krzysztof Daniel, Red Hat, Inc. - tycho enablement +# Hannes Wellmann - Leverage Tycho pomless ############################################################################### custom = true bin.includes = .,*.jnilib,about_files/,about.html,fragment.properties bin.excludes = library/ source.. = src/ src.includes = about.html,about_files/ + +tycho.pomless.parent=../binaries-parent +pom.model.groupId=org.eclipse.swt +pom.model.property.os=macosx +pom.model.property.ws=cocoa +pom.model.property.arch=x86_64 +pom.model.property.targets= diff --git a/bundles/org.eclipse.swt.cocoa.macosx.x86_64/pom.xml b/bundles/org.eclipse.swt.cocoa.macosx.x86_64/pom.xml deleted file mode 100644 index 3a66091abe..0000000000 --- a/bundles/org.eclipse.swt.cocoa.macosx.x86_64/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - binaries-parent - eclipse.platform.swt.binaries - 4.31.0-SNAPSHOT - ../binaries-parent/ - - org.eclipse.swt - org.eclipse.swt.cocoa.macosx.x86_64 - 3.125.0-SNAPSHOT - eclipse-plugin - - - macosx - cocoa - x86_64 - - - - diff --git a/bundles/org.eclipse.swt.gtk.linux.aarch64/build.properties b/bundles/org.eclipse.swt.gtk.linux.aarch64/build.properties index a53575507c..c93202353e 100644 --- a/bundles/org.eclipse.swt.gtk.linux.aarch64/build.properties +++ b/bundles/org.eclipse.swt.gtk.linux.aarch64/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015 Red Hat Inc. and others. +# Copyright (c) 2015, 2024 Red Hat Inc. and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,9 +7,17 @@ # # Contributors: # Alexander Kurtakov, Red Hat, Inc.- initial API and implementation +# Hannes Wellmann - Leverage Tycho pomless ############################################################################### custom = true bin.includes = .,*.so,about_files/,about.html,fragment.properties bin.excludes = library/ source.. = src/ src.includes = about.html,about_files/ + +tycho.pomless.parent=../binaries-parent +pom.model.groupId=org.eclipse.swt +pom.model.property.os=linux +pom.model.property.ws=gtk +pom.model.property.arch=aarch64 +pom.model.property.targets=install diff --git a/bundles/org.eclipse.swt.gtk.linux.aarch64/pom.xml b/bundles/org.eclipse.swt.gtk.linux.aarch64/pom.xml deleted file mode 100644 index cbe8d2111b..0000000000 --- a/bundles/org.eclipse.swt.gtk.linux.aarch64/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - binaries-parent - eclipse.platform.swt.binaries - 4.31.0-SNAPSHOT - ../binaries-parent/ - - org.eclipse.swt - org.eclipse.swt.gtk.linux.aarch64 - 3.125.0-SNAPSHOT - eclipse-plugin - - - linux - gtk - aarch64 - install - - - diff --git a/bundles/org.eclipse.swt.gtk.linux.loongarch64/build.properties b/bundles/org.eclipse.swt.gtk.linux.loongarch64/build.properties index b93ee5cb97..601c2ee21a 100644 --- a/bundles/org.eclipse.swt.gtk.linux.loongarch64/build.properties +++ b/bundles/org.eclipse.swt.gtk.linux.loongarch64/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2022 Loongson Co.Ltd. and others. +# Copyright (c) 2022, 2024 Loongson Co.Ltd. and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,9 +7,17 @@ # # Contributors: # Loongson Co.Ltd.- initial API and implementation +# Hannes Wellmann - Leverage Tycho pomless ############################################################################### custom = true bin.includes = .,*.so,about_files/,about.html,fragment.properties bin.excludes = library/ source.. = src/ src.includes = about.html,about_files/ + +tycho.pomless.parent=../binaries-parent +pom.model.groupId=org.eclipse.swt +pom.model.property.os=linux +pom.model.property.ws=gtk +pom.model.property.arch=loongarch64 +pom.model.property.targets=install diff --git a/bundles/org.eclipse.swt.gtk.linux.loongarch64/pom.xml b/bundles/org.eclipse.swt.gtk.linux.loongarch64/pom.xml deleted file mode 100644 index 4dec35f705..0000000000 --- a/bundles/org.eclipse.swt.gtk.linux.loongarch64/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - binaries-parent - eclipse.platform.swt.binaries - 4.31.0-SNAPSHOT - ../binaries-parent/ - - org.eclipse.swt - org.eclipse.swt.gtk.linux.loongarch64 - 3.125.0-SNAPSHOT - eclipse-plugin - - - linux - gtk - loongarch64 - install - - - diff --git a/bundles/org.eclipse.swt.gtk.linux.ppc64le/build.properties b/bundles/org.eclipse.swt.gtk.linux.ppc64le/build.properties index c95ff76da1..840bc03d2b 100644 --- a/bundles/org.eclipse.swt.gtk.linux.ppc64le/build.properties +++ b/bundles/org.eclipse.swt.gtk.linux.ppc64le/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2005 IBM Corporation and others. +# Copyright (c) 2000, 2024 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,9 +7,17 @@ # # Contributors: # IBM Corporation - initial API and implementation +# Hannes Wellmann - Leverage Tycho pomless ############################################################################### custom = true bin.includes = .,*.so,about_files/,about.html,fragment.properties bin.excludes = library/ source.. = src/ src.includes = about.html,about_files/ + +tycho.pomless.parent=../binaries-parent +pom.model.groupId=org.eclipse.swt +pom.model.property.os=linux +pom.model.property.ws=gtk +pom.model.property.arch=ppc64le +pom.model.property.targets=install diff --git a/bundles/org.eclipse.swt.gtk.linux.ppc64le/pom.xml b/bundles/org.eclipse.swt.gtk.linux.ppc64le/pom.xml deleted file mode 100644 index a68678a835..0000000000 --- a/bundles/org.eclipse.swt.gtk.linux.ppc64le/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - binaries-parent - eclipse.platform.swt.binaries - 4.31.0-SNAPSHOT - ../binaries-parent/ - - org.eclipse.swt - org.eclipse.swt.gtk.linux.ppc64le - 3.125.0-SNAPSHOT - eclipse-plugin - - - linux - gtk - ppc64le - install - - - diff --git a/bundles/org.eclipse.swt.gtk.linux.x86_64/build.properties b/bundles/org.eclipse.swt.gtk.linux.x86_64/build.properties index 6f99aecc20..5c07bf10be 100644 --- a/bundles/org.eclipse.swt.gtk.linux.x86_64/build.properties +++ b/bundles/org.eclipse.swt.gtk.linux.x86_64/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2005 IBM Corporation and others. +# Copyright (c) 2000, 2024 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,9 +8,17 @@ # Contributors: # IBM Corporation - initial API and implementation # Krzysztof Daniel, Red Hat, Inc. - tycho enablement +# Hannes Wellmann - Leverage Tycho pomless ############################################################################### custom = true bin.includes = .,*.so,about_files/,about.html,fragment.properties bin.excludes = library/ source.. = src/ src.includes = about.html,about_files/ + +tycho.pomless.parent=../binaries-parent +pom.model.groupId=org.eclipse.swt +pom.model.property.os=linux +pom.model.property.ws=gtk +pom.model.property.arch=x86_64 +pom.model.property.targets=install diff --git a/bundles/org.eclipse.swt.gtk.linux.x86_64/pom.xml b/bundles/org.eclipse.swt.gtk.linux.x86_64/pom.xml deleted file mode 100644 index 7b6d00aadd..0000000000 --- a/bundles/org.eclipse.swt.gtk.linux.x86_64/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - binaries-parent - eclipse.platform.swt.binaries - 4.31.0-SNAPSHOT - ../binaries-parent/ - - org.eclipse.swt - org.eclipse.swt.gtk.linux.x86_64 - 3.125.0-SNAPSHOT - eclipse-plugin - - - linux - gtk - x86_64 - install - - - diff --git a/bundles/org.eclipse.swt.win32.win32.x86_64/build.properties b/bundles/org.eclipse.swt.win32.win32.x86_64/build.properties index a16a971141..784476625b 100644 --- a/bundles/org.eclipse.swt.win32.win32.x86_64/build.properties +++ b/bundles/org.eclipse.swt.win32.win32.x86_64/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2012 IBM Corporation and others. +# Copyright (c) 2000, 2024 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,9 +8,17 @@ # Contributors: # IBM Corporation - initial API and implementation # Krzysztof Daniel, Red Hat, Inc. - tycho enablement +# Hannes Wellmann - Leverage Tycho pomless ############################################################################### custom = true bin.includes = .,*.dll,about_files/,about.html,fragment.properties bin.excludes = library/ source.. = src/ src.includes = about.html,about_files/ + +tycho.pomless.parent=../binaries-parent +pom.model.groupId=org.eclipse.swt +pom.model.property.os=win32 +pom.model.property.ws=win32 +pom.model.property.arch=x86_64 +pom.model.property.targets=x86_64 all install diff --git a/bundles/org.eclipse.swt.win32.win32.x86_64/pom.xml b/bundles/org.eclipse.swt.win32.win32.x86_64/pom.xml deleted file mode 100644 index efef20670f..0000000000 --- a/bundles/org.eclipse.swt.win32.win32.x86_64/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - binaries-parent - eclipse.platform.swt.binaries - 4.31.0-SNAPSHOT - ../binaries-parent/ - - org.eclipse.swt - org.eclipse.swt.win32.win32.x86_64 - 3.125.0-SNAPSHOT - eclipse-plugin - - - win32 - win32 - x86_64 - x86_64 all install - - -