From 237811252b3f272fcc0dfca2d403b876a404ec64 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 6 Jan 2024 14:39:15 +0100
Subject: [PATCH] [Build] Merge binaries-parent into binaries directory

Part of https://github.com/eclipse-platform/eclipse.platform.swt/issues/513
---
 Jenkinsfile                                   |   2 +-
 binaries/binaries-parent/pom.xml              | 164 ------------------
 binaries/{binaries-parent => }/build.xml      |   4 +-
 .../build.properties                          |   2 -
 .../build.properties                          |   2 -
 .../build.properties                          |   2 -
 .../build.properties                          |   2 -
 .../build.properties                          |   2 -
 .../build.properties                          |   2 -
 .../build.properties                          |   2 -
 binaries/pom.xml                              | 145 +++++++++++++++-
 bundles/org.eclipse.swt/buildInternal.xml     |   4 +-
 bundles/org.eclipse.swt/buildSWT.xml          |   2 +-
 13 files changed, 150 insertions(+), 185 deletions(-)
 delete mode 100644 binaries/binaries-parent/pom.xml
 rename binaries/{binaries-parent => }/build.xml (71%)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4bfc844dfd9..befd0fb69d6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -133,7 +133,7 @@ pipeline {
 								withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk11-latest') { // nashorn javascript-engine required in ant-scripts
 									sh '''
 										pfSpec=(${PLATFORM//"."/ })
-										ant -f binaries-parent/build.xml copy_library_src_and_create_zip -Dws=${pfSpec[0]} -Dos=${pfSpec[1]} -Darch=${pfSpec[2]}
+										ant -f build.xml copy_library_src_and_create_zip -Dws=${pfSpec[0]} -Dos=${pfSpec[1]} -Darch=${pfSpec[2]}
 									'''
 								}
 								dir("org.eclipse.swt.${PLATFORM}/tmpdir") {
diff --git a/binaries/binaries-parent/pom.xml b/binaries/binaries-parent/pom.xml
deleted file mode 100644
index 384fcc1a115..00000000000
--- a/binaries/binaries-parent/pom.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- 
-###############################################################################
-# Copyright (c) 2012, 2018 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Krzysztof Daniel, Red Hat, Inc. - initial API and implementation
-###############################################################################
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>eclipse.platform.swt.binaries</artifactId>
-        <groupId>eclipse.platform.swt.binaries</groupId>
-        <version>4.31.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>binaries-parent</artifactId>
-    <packaging>pom</packaging>
-
-    <properties>
-        <!-- 
-            forceContextQualifier gets updated during build input process using
-            ant script <SWT source repo>/bundles/org.eclipse.swt/buildInternal.xml 
-        -->
-        <forceContextQualifier>v20240108-1800</forceContextQualifier>
-        <buildid>${buildId}</buildid>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>src</directory>
-                            <includes>
-                                <include>**/*</include>
-                            </includes>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-compiler-plugin</artifactId>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-packaging-plugin</artifactId>
-                <configuration>
-                    <forceContextQualifier>${forceContextQualifier}</forceContextQualifier>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>target-platform-configuration</artifactId>
-                <configuration>
-                    <executionEnvironment>JavaSE-17</executionEnvironment>
-                    <dependency-resolution>
-                        <profileProperties>
-                            <!-- set property so that the filter condition on the p2 dependencies from org.eclipse.swt to the fragments does not match -->
-                            <org.eclipse.swt.buildtime>true</org.eclipse.swt.buildtime>
-                        </profileProperties>
-                    </dependency-resolution>
-                    <environments>
-                        <environment>
-                            <os>${os}</os>
-                            <ws>${ws}</ws>
-                            <arch>${arch}</arch>
-                        </environment>
-                    </environments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>normal</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="copy.src.dir" value="src" />
-                                <ant antfile="../binaries-parent/build.xml" target="copy.${ws}.src" />
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>natives</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- See https://stackoverflow.com/a/53227117 and http://ant-contrib.sourceforge.net/tasks/tasks/index.html -->
-                                <taskdef resource="net/sf/antcontrib/antlib.xml" />
-                                <if>
-                                    <equals arg1="${native}" arg2="${ws}.${os}.${arch}" />
-                                    <then>
-                                        <ant antfile="../binaries-parent/build.xml" target="build_libraries" />
-                                    </then>
-                                </if>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>swtdownload</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="eclipse.version" value="${releaseNumberSDK}" />
-                                <ant antfile="../binaries-parent/build.xml" target="swtdownload" />
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.mozilla</groupId>
-                        <artifactId>rhino-runtime</artifactId>
-                        <version>1.7.14</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>1.10.14</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ant</groupId>
-                        <artifactId>ant-apache-bsf</artifactId>
-                        <version>1.10.14</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>1.0b3</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/binaries/binaries-parent/build.xml b/binaries/build.xml
similarity index 71%
rename from binaries/binaries-parent/build.xml
rename to binaries/build.xml
index 3485a3cd8b0..6e6f4588cf8 100644
--- a/binaries/binaries-parent/build.xml
+++ b/binaries/build.xml
@@ -6,6 +6,6 @@
 	<property name="swt.arch" value="${arch}" />
 	
 	<property name="plugindir" value="../../bundles/org.eclipse.swt"/>
-	<import file="${plugindir}/buildFragment.xml"/>
-	<import file="${plugindir}/buildSWT.xml"/>
+	<import file="../bundles/org.eclipse.swt/buildFragment.xml"/>
+	<import file="../bundles/org.eclipse.swt/buildSWT.xml"/>
 </project>
\ No newline at end of file
diff --git a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties
index deeffc9861e..933f1d484b8 100644
--- a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties
+++ b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties
@@ -16,8 +16,6 @@ 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
diff --git a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties
index 9c5ef7a84e7..51280a38b24 100644
--- a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties
+++ b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties
@@ -16,8 +16,6 @@ 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
diff --git a/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties b/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties
index c93202353e5..65c1768feb7 100644
--- a/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties
+++ b/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties
@@ -15,8 +15,6 @@ 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
diff --git a/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties b/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties
index 601c2ee21aa..0286d720aa6 100644
--- a/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties
+++ b/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties
@@ -15,8 +15,6 @@ 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
diff --git a/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties b/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties
index 840bc03d2b4..30cefaf6960 100644
--- a/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties
+++ b/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties
@@ -15,8 +15,6 @@ 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
diff --git a/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties b/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties
index 5c07bf10bef..c145e4881b8 100644
--- a/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties
+++ b/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties
@@ -16,8 +16,6 @@ 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
diff --git a/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties b/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties
index 784476625b2..dc7445c23e8 100644
--- a/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties
+++ b/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties
@@ -16,8 +16,6 @@ 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
diff --git a/binaries/pom.xml b/binaries/pom.xml
index d162cf75d7a..ccd2118cb5d 100644
--- a/binaries/pom.xml
+++ b/binaries/pom.xml
@@ -22,10 +22,20 @@
 		<version>4.31.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>eclipse.platform.swt.binaries</groupId>
+	<groupId>org.eclipse.swt</groupId>
 	<artifactId>eclipse.platform.swt.binaries</artifactId>
 	<packaging>pom</packaging>
 
+	<properties>
+		<!-- 
+			forceContextQualifier gets updated during build input process using
+			ant script <SWT source repo>/bundles/org.eclipse.swt/buildInternal.xml 
+		-->
+		<forceContextQualifier>v20240102-1528</forceContextQualifier>
+		<buildid>${buildId}</buildid>
+		<maven.compiler.release>17</maven.compiler.release>
+	</properties>
+
 	<modules>
 		<module>org.eclipse.swt.cocoa.macosx.x86_64</module>
 		<module>org.eclipse.swt.cocoa.macosx.aarch64</module>
@@ -35,4 +45,137 @@
 		<module>org.eclipse.swt.win32.win32.x86_64</module>
 	</modules>
 
+	<profiles>
+		<profile>
+			<id>build-natitve-fragment</id>
+			<activation>
+				<file><!-- Only build the native fragment projects in this directory -->
+					<exists>META-INF/MANIFEST.MF</exists>
+				</file>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-clean-plugin</artifactId>
+						<configuration>
+							<filesets>
+								<fileset>
+									<directory>src</directory>
+									<includes>
+										<include>**/*</include>
+									</includes>
+									<followSymlinks>false</followSymlinks>
+								</fileset>
+							</filesets>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>target-platform-configuration</artifactId>
+						<configuration>
+							<executionEnvironment>JavaSE-${maven.compiler.release}</executionEnvironment>
+							<dependency-resolution>
+								<profileProperties>
+									<!-- set property so that the filter condition on the p2 dependencies from org.eclipse.swt to the fragments does not match -->
+									<org.eclipse.swt.buildtime>true</org.eclipse.swt.buildtime>
+								</profileProperties>
+							</dependency-resolution>
+							<environments>
+								<environment>
+									<os>${os}</os>
+									<ws>${ws}</ws>
+									<arch>${arch}</arch>
+								</environment>
+							</environments>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-packaging-plugin</artifactId>
+						<configuration>
+							<forceContextQualifier>${forceContextQualifier}</forceContextQualifier>
+						</configuration>
+					</plugin>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>normal</id>
+								<phase>initialize</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<property name="copy.src.dir" value="src" />
+										<ant antfile="../build.xml" target="copy.${ws}.src" />
+									</target>
+								</configuration>
+							</execution>
+							<execution>
+								<id>natives</id>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<!-- See https://stackoverflow.com/a/53227117 and http://ant-contrib.sourceforge.net/tasks/tasks/index.html -->
+										<taskdef resource="net/sf/antcontrib/antlib.xml" />
+										<if>
+											<equals arg1="${native}" arg2="${ws}.${os}.${arch}" />
+											<then>
+												<ant antfile="../build.xml" target="build_libraries" />
+											</then>
+										</if>
+									</target>
+								</configuration>
+							</execution>
+							<execution>
+								<id>swtdownload</id>
+								<phase>package</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<property name="eclipse.version" value="${releaseNumberSDK}" />
+										<ant antfile="../build.xml" target="swtdownload" />
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>org.mozilla</groupId>
+								<artifactId>rhino-runtime</artifactId>
+								<version>1.7.14</version>
+							</dependency>
+							<dependency>
+								<groupId>org.apache.ant</groupId>
+								<artifactId>ant</artifactId>
+								<version>1.10.14</version>
+							</dependency>
+							<dependency>
+								<groupId>org.apache.ant</groupId>
+								<artifactId>ant-apache-bsf</artifactId>
+								<version>1.10.14</version>
+							</dependency>
+							<dependency>
+								<groupId>ant-contrib</groupId>
+								<artifactId>ant-contrib</artifactId>
+								<version>1.0b3</version>
+								<exclusions>
+									<exclusion>
+										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
+									</exclusion>
+								</exclusions>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/bundles/org.eclipse.swt/buildInternal.xml b/bundles/org.eclipse.swt/buildInternal.xml
index 4c04d92df40..6aa997424e1 100644
--- a/bundles/org.eclipse.swt/buildInternal.xml
+++ b/bundles/org.eclipse.swt/buildInternal.xml
@@ -21,7 +21,7 @@
 <project name="swtinternalbuild" basedir=".">
 	<import file="buildSWT.xml"/>
 	<property name="file_src_pom" value="bundles/org.eclipse.swt/pom.xml"/>
-	<property name="file_bin_parent_pom" value="binaries/binaries-parent/pom.xml"/>
+	<property name="file_bin_parent_pom" value="binaries/pom.xml"/>
 	<property name="lib.dir" value="/var/lib/hudson/antlib"/>
 	
 	<!-- When there are build changes, generates the time-stamp qualifiers and updates the pom files in source and binaries repo -->
@@ -31,7 +31,7 @@
 	</target>
 	
 	<!--
-		Update forceContextQualifier property in bundles/org.eclipse.swt/pom.xml and binaries/binaries-parent/pom.xml
+		Update forceContextQualifier property in bundles/org.eclipse.swt/pom.xml and binaries/pom.xml
 		
 		We match existing forceContextQualifier in the format vyyyyMMdd-HHmm and replace this with v${build.qualifier}
 		
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index c26bf6a4122..395a033a1fe 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -45,7 +45,7 @@
 	<property name="file_make_common" value="bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak"/>
 	<property name="file_version" value="bundles/org.eclipse.swt/Eclipse SWT/common/version.txt"/>
 	<property name="file_src_pom" value="bundles/org.eclipse.swt/pom.xml"/>
-	<property name="file_bin_parent_pom" value="binaries/binaries-parent/pom.xml"/>
+	<property name="file_bin_parent_pom" value="binaries/pom.xml"/>
 	
 	<target name="check_fragment_libraries" depends="get_version">
 		<echo>Checking ${fragment}</echo>