Unify Tycho pomless configurations and build.properties

HannesWell · HannesWell · commit ea7af55c9d61 · 2025-03-27T22:10:52.000+01:00
And use tycho-pomles for the swt.fragments.localbuild project.
diff --git a/bundles/build.properties b/bundles/build.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2025, 2025 Hannes Wellmann and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     Hannes Wellmann - initial API and implementation
+###############################################################################
+
+tycho.pomless.parent = ../local-build/local-build-parent
diff --git a/bundles/org.eclipse.swt.svg/build.properties b/bundles/org.eclipse.swt.svg/build.properties
@@ -1,10 +1,22 @@
+###############################################################################
+# Copyright (c) 2025, 2025 Vector Informatik GmbH and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     Michael Bangas (Vector Informatik GmbH) - initial API and implementation
+###############################################################################
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
                fragment.properties
 
-tycho.pomless.parent = ../../local-build/local-build-parent
 jars.extra.classpath = platform:/plugin/org.eclipse.swt.cocoa.macosx.aarch64,\
                        platform:/plugin/org.eclipse.swt.cocoa.macosx.x86_64,\
                        platform:/plugin/org.eclipse.swt.gtk.linux.aarch64,\
diff --git a/bundles/org.eclipse.swt.tools.base/build.properties b/bundles/org.eclipse.swt.tools.base/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2015 IBM Corporation and others.
+# Copyright (c) 2003, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -17,5 +17,3 @@ bin.includes = about.html,\
                META-INF/,\
                .
 src.includes = about.html
-
-tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/bundles/org.eclipse.swt.tools.spies/build.properties b/bundles/org.eclipse.swt.tools.spies/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2015 IBM Corporation and others.
+# Copyright (c) 2003, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -11,15 +11,13 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
+source.. = src/
+output.. = bin/
 bin.includes = about.html,\
                plugin.xml,\
                plugin.properties,\
                META-INF/,\
                icons/,\
                .,\
                fragment.e4xmi
-output.. = bin/
-source.. = src/
 src.includes = about.html
-
-tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/bundles/org.eclipse.swt.tools/build.properties b/bundles/org.eclipse.swt.tools/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2017 IBM Corporation and others.
+# Copyright (c) 2003, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -18,13 +18,11 @@ bin.includes = about.html,\
                templates/,\
                icons/,\
                .
-output.. = bin/
 source.. = src/,\
            JNI Generation/,\
            Mac Generation/,\
            Icon Exe/,\
            JavadocBasher/
+output.. = bin/
 src.includes = about.html
 bin.excludes = META-INF/p2.inf
-
-tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/examples/org.eclipse.swt.examples.launcher/build.properties b/examples/org.eclipse.swt.examples.launcher/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,8 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
+source.. = src/
+output.. = bin/
 bin.includes = doc/,\
                doc-html/,\
                icons/,\
@@ -23,7 +25,4 @@ bin.includes = doc/,\
 	           
 src.includes = about.html
 
-source.. = src/
-output.. = bin/
-
 tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/examples/org.eclipse.swt.examples.ole.win32/build.properties b/examples/org.eclipse.swt.examples.ole.win32/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -11,16 +11,13 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
+source.. = src/
+output.. = bin/
 bin.includes = doc-html/,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
                about.html,\
                .,\
                META-INF/
-
 src.includes = about.html
-            
-source.. = src/
-
-output.. = bin/
diff --git a/examples/org.eclipse.swt.examples.views/build.properties b/examples/org.eclipse.swt.examples.views/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -11,17 +11,15 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
+source.. = src/
+output.. = bin/
 bin.includes = doc-html/,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
                about.html,\
                .,\
                META-INF/
-
 src.includes = about.html
 
-source.. = src/
-output.. = bin/
-
 tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/examples/org.eclipse.swt.examples/build.properties b/examples/org.eclipse.swt.examples/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -11,6 +11,8 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
+source.. = src/
+output.. = bin/
 bin.includes = doc-html/,\
                plugin.properties,\
                plugin.xml,\
@@ -20,8 +22,5 @@ bin.includes = doc-html/,\
 
 src.includes = about.html,\
                doc-html/
-               
-source.. = src/
-output.. = bin/
 
 tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/local-build/org.eclipse.swt.fragments.localbuild/build.properties b/local-build/org.eclipse.swt.fragments.localbuild/build.properties
@@ -1,3 +1,5 @@
 bin.includes = META-INF/,\
                plugin.properties,\
                .
+
+tycho.pomless.parent = ../../
diff --git a/local-build/org.eclipse.swt.fragments.localbuild/pom.xml b/local-build/org.eclipse.swt.fragments.localbuild/pom.xml
diff --git a/tests/build.properties b/tests/build.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2025, 2025 Hannes Wellmann and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     Hannes Wellmann - initial API and implementation
+###############################################################################
+
+tycho.pomless.parent = ../local-build/local-build-parent
+
+pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
+# Skip all tests on build servers, because it contains platform specific code (overriden to false on platform-specific build machines)
+pom.model.property.skipNativeTests = true
+pom.model.property.skipTests = ${skipNativeTests}
diff --git a/tests/org.eclipse.swt.tests.cocoa/build.properties b/tests/org.eclipse.swt.tests.cocoa/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017 Conrad Groth and others.
+# Copyright (c) 2017, 2025 Conrad Groth and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -12,17 +12,12 @@
 #     Conrad Groth - initial implementation
 ###############################################################################
 source..=JUnit Tests/
-
+output.. = bin/
 bin.includes = .,\
                META-INF/
 
 # The following dependency prevents parallel execution of this and the referenced test-project. 
 # Both use the same not-shareable resources and therefore cannot run in parallel. 
 additional.bundles = org.eclipse.swt.tests
 
-tycho.pomless.parent = ../../local-build/local-build-parent
 pom.model.packaging = eclipse-test-plugin
-pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
-# Skip all tests on build servers, because it contains platform specific code (overriden to false on platform-specific build machines)
-pom.model.property.skipNativeTests = true
-pom.model.property.skipTests = ${skipNativeTests}
diff --git a/tests/org.eclipse.swt.tests.gtk/build.properties b/tests/org.eclipse.swt.tests.gtk/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017 Conrad Groth and others.
+# Copyright (c) 2017, 2025 Conrad Groth and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -13,16 +13,12 @@
 ###############################################################################
 source.. = JUnit Tests/,\
            ManualTests/
+output.. = bin/
 bin.includes = .,\
                META-INF/
 
 # The following dependency prevents parallel execution of this and the referenced test-project. 
 # Both use the same not-shareable resources and therefore cannot run in parallel. 
 additional.bundles = org.eclipse.swt.tests
 
-tycho.pomless.parent = ../../local-build/local-build-parent
 pom.model.packaging = eclipse-test-plugin
-pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
-# Skip all tests on build servers, because it contains platform specific code (overriden to false on platform-specific build machines)
-pom.model.property.skipNativeTests = true
-pom.model.property.skipTests = ${skipNativeTests}
diff --git a/tests/org.eclipse.swt.tests.win32/build.properties b/tests/org.eclipse.swt.tests.win32/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017 Conrad Groth and others.
+# Copyright (c) 2017, 2025 Conrad Groth and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -12,19 +12,13 @@
 #     Conrad Groth - initial implementation
 ###############################################################################
 source..=JUnit Tests/
-
+output.. = bin/
 bin.includes = .,\
                META-INF/
 
-
 # The following dependency prevents parallel execution of this and the referenced test-project. 
 # Both use the same not-shareable resources and therefore cannot run in parallel. 
 additional.bundles = org.eclipse.swt.tests
 
-tycho.pomless.parent = ../../local-build/local-build-parent
 pom.model.packaging = eclipse-test-plugin
-pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
-# Skip all tests on build servers, because it contains platform specific code (overriden to false on platform-specific build machines)
-pom.model.property.skipNativeTests = true
-pom.model.property.skipTests = ${skipNativeTests}
 pom.model.property.testClass = org.eclipse.swt.tests.win32.AllWin32Tests
diff --git a/tests/org.eclipse.swt.tests/build.properties b/tests/org.eclipse.swt.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2018 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -13,7 +13,7 @@
 ###############################################################################
 source.. = JUnit Tests/,\
            data/
-
+output.. = bin/
 src.excludes = ManualTests/
 
 bin.includes = .,\

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`###############################################################################`
`2`		`-# Copyright (c) 2003, 2015 IBM Corporation and others.`
	`2`	`+# Copyright (c) 2003, 2025 IBM Corporation and others.`
`3`	`3`	`#`
`4`	`4`	`# This program and the accompanying materials`
`5`	`5`	`# are made available under the terms of the Eclipse Public License 2.0`
`@@ -17,5 +17,3 @@ bin.includes = about.html,\`
`17`	`17`	`META-INF/,\`
`18`	`18`	`.`
`19`	`19`	`src.includes = about.html`
`20`		`-`
`21`		`-tycho.pomless.parent = ../../local-build/local-build-parent`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
`1`	`1`	`bin.includes = META-INF/,\`
`2`	`2`	`plugin.properties,\`
`3`	`3`	`.`
	`4`	`+`
	`5`	`+tycho.pomless.parent = ../../`