Bug 572799 - Replace arm64 with aarch64

Change-Id: I03e1656ee6fcee66479cbfbe80bc8a86b1ed3076
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/179836
Tested-by: Lakshmi P Shanmugam <lshanmug@in.ibm.com>
Reviewed-by: Lakshmi P Shanmugam <lshanmug@in.ibm.com>

11 files changed, 31 insertions, 30 deletions

diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
index 6960db0a4..c3e9d85c0 100755
--- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh
+++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
@@ -58,8 +58,8 @@ if [ -z $PATCH_BUILD ]; then
     cp org.eclipse.sdk.ide-linux.gtk.x86_64.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-SDK-$BUILD_ID-linux-gtk-x86_64.tar.gz
     cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-SDK-$BUILD_ID-macosx-cocoa-x86_64.tar.gz
     cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.dmg $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-SDK-$BUILD_ID-macosx-cocoa-x86_64.dmg
-    cp org.eclipse.sdk.ide-macosx.cocoa.arm64.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-SDK-$BUILD_ID-macosx-cocoa-arm64.tar.gz
-    cp org.eclipse.sdk.ide-macosx.cocoa.arm64.dmg $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-SDK-$BUILD_ID-macosx-cocoa-arm64.dmg
+    cp org.eclipse.sdk.ide-macosx.cocoa.aarch64.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-SDK-$BUILD_ID-macosx-cocoa-aarch64.tar.gz
+    cp org.eclipse.sdk.ide-macosx.cocoa.aarch64.dmg $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-SDK-$BUILD_ID-macosx-cocoa-aarch64.dmg
     cp org.eclipse.sdk.ide-win32.win32.x86_64.zip $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-SDK-$BUILD_ID-win32-x86_64.zip
     # platform
     cp org.eclipse.platform.ide-linux.gtk.aarch64.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-linux-gtk-aarch64.tar.gz
@@ -67,18 +67,18 @@ if [ -z $PATCH_BUILD ]; then
     cp org.eclipse.platform.ide-linux.gtk.x86_64.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-linux-gtk-x86_64.tar.gz
     cp org.eclipse.platform.ide-macosx.cocoa.x86_64.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-macosx-cocoa-x86_64.tar.gz
     cp org.eclipse.platform.ide-macosx.cocoa.x86_64.dmg $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-macosx-cocoa-x86_64.dmg
-    cp org.eclipse.platform.ide-macosx.cocoa.arm64.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-macosx-cocoa-arm64.tar.gz
-    cp org.eclipse.platform.ide-macosx.cocoa.arm64.dmg $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-macosx-cocoa-arm64.dmg
+    cp org.eclipse.platform.ide-macosx.cocoa.aarch64.tar.gz $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-macosx-cocoa-aarch64.tar.gz
+    cp org.eclipse.platform.ide-macosx.cocoa.aarch64.dmg $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-macosx-cocoa-aarch64.dmg
     cp org.eclipse.platform.ide-win32.win32.x86_64.zip $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-win32-x86_64.zip
     popd
     chmod +x $CJE_ROOT/scripts/notarizeMacApp.sh
     NOTARIZE_LOG_DIR=$CJE_ROOT/notarizeLog
     mkdir -p $NOTARIZE_LOG_DIR
-    (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-SDK-${BUILD_ID}-macosx-cocoa-arm64.dmg > $NOTARIZE_LOG_DIR/sdkArm64.log 2>&1)&
+    (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-SDK-${BUILD_ID}-macosx-cocoa-aarch64.dmg > $NOTARIZE_LOG_DIR/sdkAarch64.log 2>&1)&
     sleep 18s
     (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg > $NOTARIZE_LOG_DIR/sdkX64.log 2>&1)&
     sleep 18s
-    (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-platform-${BUILD_ID}-macosx-cocoa-arm64.dmg > $NOTARIZE_LOG_DIR/platformArm64.log 2>&1)&
+    (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-platform-${BUILD_ID}-macosx-cocoa-aarch64.dmg > $NOTARIZE_LOG_DIR/platformAarch64.log 2>&1)&
     sleep 18s
     (/bin/bash $CJE_ROOT/scripts/notarizeMacApp.sh "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg > $NOTARIZE_LOG_DIR/platformX64.log 2>&1)&
   fi
diff --git a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
index 719e33bf6..0db4bea21 100755
--- a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
+++ b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
@@ -32,7 +32,7 @@ if [ -d $REPO_DIR ]; then
   cp org.eclipse.rt.osgistarterkit.product-linux.gtk.x86_64.tar.gz $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-linux-gtk-x86_64.tar.gz
   cp org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.tar.gz $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-x86_64.tar.gz
   cp org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.dmg $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-x86_64.dmg
-  cp org.eclipse.rt.osgistarterkit.product-macosx.cocoa.arm64.dmg $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-arm64.dmg
+  cp org.eclipse.rt.osgistarterkit.product-macosx.cocoa.aarch64.dmg $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-aarch64.dmg
   cp org.eclipse.rt.osgistarterkit.product-win32.win32.x86_64.zip $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-win32-win32-x86_64.zip
   popd
   chmod +x $CJE_ROOT/scripts/notarizeMacApp.sh
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index b5611166e..365a71f82 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -284,7 +284,7 @@
             <environment>
               <os>macosx</os>
               <ws>cocoa</ws>
-              <arch>arm64</arch>
+              <arch>aarch64</arch>
             </environment>
           </environments>
         </configuration>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
index 275121eff..4ee147e27 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
@@ -467,13 +467,13 @@
                 </configuration>
               </execution>
               <execution>
-                <id>dmg-package-platform-arm64</id>
+                <id>dmg-package-platform-aarch64</id>
                 <goals>
                   <goal>package-dmg</goal>
                 </goals>
                 <phase>integration-test</phase>
                 <configuration>
-                  <source>${project.build.directory}/products/org.eclipse.platform.ide-macosx.cocoa.arm64.tar.gz</source>
+                  <source>${project.build.directory}/products/org.eclipse.platform.ide-macosx.cocoa.aarch64.tar.gz</source>
                   <continueOnFail>true</continueOnFail>
                   <timeoutMillis>600000</timeoutMillis> <!-- 10 min -->
                   <continueOnFail>${macSigner.forceContinue}</continueOnFail> 
@@ -495,13 +495,13 @@
                 </configuration>
               </execution>
                <execution>
-                <id>dmg-package-sdk-arm64</id>
+                <id>dmg-package-sdk-aarch64</id>
                 <goals>
                   <goal>package-dmg</goal>
                 </goals>
                 <phase>integration-test</phase>
                 <configuration>
-                  <source>${project.build.directory}/products/org.eclipse.sdk.ide-macosx.cocoa.arm64.tar.gz</source>
+                  <source>${project.build.directory}/products/org.eclipse.sdk.ide-macosx.cocoa.aarch64.tar.gz</source>
                   <continueOnFail>true</continueOnFail>
                   <timeoutMillis>600000</timeoutMillis> <!-- 10 min -->
                   <continueOnFail>${macSigner.forceContinue}</continueOnFail>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
index bd9e362e5..b8012a1ba 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
@@ -24,8 +24,8 @@
         fileName="eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg"></platform>
       <platform
         id="SMCCARM64"
-        name="Mac OSX (64 bit version for Arm64) *Early Access*"
-        fileName="eclipse-SDK-${BUILD_ID}-macosx-cocoa-arm64.dmg"></platform>     
+        name="Mac OSX (64 bit version for Arm64/AArch64) *Early Access*"
+        fileName="eclipse-SDK-${BUILD_ID}-macosx-cocoa-aarch64.dmg"></platform>     
       <platform
         id="SST"
         name="Source Tarball"
@@ -87,8 +87,8 @@
         fileName="eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg"></platform>
       <platform
         id="PMCCARM64"
-        name="Mac OSX (64 bit version for Arm64) *Early Access*"
-        fileName="eclipse-platform-${BUILD_ID}-macosx-cocoa-arm64.dmg"></platform>
+        name="Mac OSX (64 bit version for Arm64/Aarch64) *Early Access*"
+        fileName="eclipse-platform-${BUILD_ID}-macosx-cocoa-aarch64.dmg"></platform>
       <platform
         id="PLR"
         name="&lt;img src = &quot;repo.gif&quot;  alt=&quot;Runtime Repo&quot; /> Platform Runtime Repo "
@@ -129,8 +129,8 @@
         fileName="swt-${BUILD_ID}-cocoa-macosx-x86_64.zip"></platform>
       <platform
         id="SWTMCCARM64"
-        name="Mac OSX (64 bit version for ARM64) *Early Access*"
-        fileName="swt-${BUILD_ID}-cocoa-macosx-arm64.zip"></platform>
+        name="Mac OSX (64 bit version for ARM64/Aarch64) *Early Access*"
+        fileName="swt-${BUILD_ID}-cocoa-macosx-aarch64.zip"></platform>
     </zipType>
 
   </zipTypes>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index 77b104cfe..038954068 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -60,7 +60,7 @@
             <environment>
               <os>macosx</os>
               <ws>cocoa</ws>
-              <arch>arm64</arch>
+              <arch>aarch64</arch>
             </environment>
           </environments>
         </configuration>
@@ -244,13 +244,13 @@
                 </configuration>
               </execution>
               <execution>
-                <id>dmg-arm64</id>
+                <id>dmg-aarch64</id>
                 <goals>
                   <goal>package-dmg</goal>
                 </goals>
                 <phase>verify</phase>
                 <configuration>
-                  <source>${project.build.directory}/products/org.eclipse.rt.osgistarterkit.product-macosx.cocoa.arm64.tar.gz</source>
+                  <source>${project.build.directory}/products/org.eclipse.rt.osgistarterkit.product-macosx.cocoa.aarch64.tar.gz</source>
                   <continueOnFail>true</continueOnFail>
                   <timeoutMillis>600000</timeoutMillis> <!-- 10 min -->
                   <continueOnFail>${macSigner.forceContinue}</continueOnFail> 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
index 476102911..04a021479 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
@@ -18,7 +18,7 @@
     <buildRepos os="linux" ws="gtk" arch="ppc64le" archiveName="${archiveRoot}-linux.gtk.ppc64le.${buildId}.tar.gz" />
   	<buildRepos os="linux" ws="gtk" arch="aarch64" archiveName="${archiveRoot}-linux.gtk.aarch64.${buildId}.tar.gz" />
     <buildRepos os="macosx" ws="cocoa" arch="x86_64" archiveName="${archiveRoot}-macosx.cocoa.x86_64.${buildId}.tar.gz" />
-    <buildRepos os="macosx" ws="cocoa" arch="arm64" archiveName="${archiveRoot}-macosx.cocoa.arm64.${buildId}.tar.gz" />
+    <buildRepos os="macosx" ws="cocoa" arch="aarch64" archiveName="${archiveRoot}-macosx.cocoa.aarch64.${buildId}.tar.gz" />
   </target>
 
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
index 3353a0613..615c15896 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
@@ -264,8 +264,8 @@
       <platform
         format="equinox"
         id="SMCCARM64"
-        name="Mac OSX (Mac/Cocoa/Arm64)"
-        fileName="launchers-macosx.cocoa.arm64.${BUILD_ID}.tar.gz" />
+        name="Mac OSX (Mac/Cocoa/AARCH64)"
+        fileName="launchers-macosx.cocoa.aarch64.${BUILD_ID}.tar.gz" />
     </zipType>
 
     <zipType name="OSGiStarterKits">
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index 59074c38f..99f2f4f9a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -24,8 +24,8 @@ root.win32.win32.x86_64.permissions.755=eclipse.exe
 root.macosx.cocoa.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64
 root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
 
-root.macosx.cocoa.arm64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/arm64
-root.macosx.cocoa.arm64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
+root.macosx.cocoa.aarch64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/aarch64
+root.macosx.cocoa.aarch64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
 #root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
 
 # from org.eclipse.equinox.core.feature
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index b11c44f48..5914da295 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -243,11 +243,12 @@
     </condition>
     <condition
       property="platformArchive"
-      value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa-arm64.dmg">
+      value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa-aarch64.dmg">
       <and>
         <os family="mac" />
         <os family="unix" />
         <or>
+          <os arch="aarch64" />
           <os arch="arm64" />
           <os arch="arm64e" />
         </or>
@@ -1115,7 +1116,7 @@
     </condition>
     <condition
       property="runtimeArchive"
-      value="eclipse-SDK-${buildIdToUse}-macosx-cocoa-arm64.dmg">
+      value="eclipse-SDK-${buildIdToUse}-macosx-cocoa-aarch64.dmg">
       <and>
         <equals
           arg1="${os}"
@@ -1125,7 +1126,7 @@
           arg2="cocoa" />
         <equals
           arg1="${arch}"
-          arg2="arm64" />
+          arg2="aarch64" />
       </and>
     </condition>
     <echo message="runtimeArchive ${runtimeArchive} !!! " />
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 2c8fa9b96..51268c6ae 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -285,7 +285,7 @@
 	          arg2="x86_64" />
 	        <equals
 	          arg1="${osgi.arch}"
-	          arg2="arm64" />
+	          arg2="aarch64" />
        	</or>
       </and>
     </condition>