[Build] Merge binaries-parent into binaries directory

Part of #513
eclipse-platform · Jan 9, 2024 · 2378112 · 2378112
1 parent bb3af98
commit 2378112
Show file tree

Hide file tree

Showing 13 changed files with 150 additions and 185 deletions.
diff --git 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
diff --git a/binaries/binaries-parent/build.xml → binaries/build.xml b/binaries/binaries-parent/build.xml → 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>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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