From 8de63a25a106cbbd33ae6066aaf9d01d05b52fe8 Mon Sep 17 00:00:00 2001
From: Martin Lippert <lippertm@vmware.com>
Date: Mon, 28 Jun 2021 12:46:01 +0200
Subject: [PATCH] now putting the aarch64 build into the aarch64 dmg file
 instead of the x86_64 one

---
 .../org.springframework.boot.ide.product.e420/pom.xml  |  4 ++--
 .../spring-tool-suite-4-dmg-config-e4.20-aarch64.json  | 10 ++++++++++
 ...n => spring-tool-suite-4-dmg-config-e4.20-x86.json} |  0
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 eclipse-distribution/org.springframework.boot.ide.product.e420/spring-tool-suite-4-dmg-config-e4.20-aarch64.json
 rename eclipse-distribution/org.springframework.boot.ide.product.e420/{spring-tool-suite-4-dmg-config-e4.20.json => spring-tool-suite-4-dmg-config-e4.20-x86.json} (100%)

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml
index 5a96cf2a7..9c060215e 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e420/pom.xml
@@ -348,14 +348,14 @@
 							<target>
 
 								<exec executable="/usr/local/bin/appdmg" failonerror="true">
-									<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}.json"/>
+									<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}-x86.json"/>
 									<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
 								</exec>
 
 								<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>
 								
 								<exec executable="/usr/local/bin/appdmg" failonerror="true">
-									<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}.json"/>
+									<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}-aarch64.json"/>
 									<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg"/>
 								</exec>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e420/spring-tool-suite-4-dmg-config-e4.20-aarch64.json b/eclipse-distribution/org.springframework.boot.ide.product.e420/spring-tool-suite-4-dmg-config-e4.20-aarch64.json
new file mode 100644
index 000000000..ba3c1e32b
--- /dev/null
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e420/spring-tool-suite-4-dmg-config-e4.20-aarch64.json
@@ -0,0 +1,10 @@
+{
+  "title": "Spring Tool Suite 4",
+  "icon": "../org.springframework.boot.ide.branding/sts4.icns",
+  "contents": [
+    { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/aarch64/SpringToolSuite4.app" },
+    { "x": 448, "y": 100, "type": "link", "path": "/Applications" },
+    { "x": 1000, "y": 2000, "type": "file", "path": "../org.springframework.boot.ide.branding/sts4.icns", "name": ".VolumeIcon.icns" }
+  ],
+  "format": "UDZO"
+}
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e420/spring-tool-suite-4-dmg-config-e4.20.json b/eclipse-distribution/org.springframework.boot.ide.product.e420/spring-tool-suite-4-dmg-config-e4.20-x86.json
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e420/spring-tool-suite-4-dmg-config-e4.20.json
rename to eclipse-distribution/org.springframework.boot.ide.product.e420/spring-tool-suite-4-dmg-config-e4.20-x86.json