Bug 570540 - Build eclipse for Mac M1 processor architecture

Change-Id: If481588207b680200cce90953d20d2e8d3a9b5a9
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

10 files changed, 108 insertions, 9 deletions

diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
index 203dfe125..13920a1ba 100755
--- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh
+++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
@@ -58,9 +58,12 @@ 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-win32.win32.x86_64.zip $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-SDK-$BUILD_ID-win32-x86_64.zip
     popd
     fn-notarize-macbuild "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg
+    fn-notarize-macbuild "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-SDK-${BUILD_ID}-macosx-cocoa-arm64.dmg
   fi
 
   # gather platform
@@ -72,9 +75,12 @@ 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-win32.win32.x86_64.zip $CJE_ROOT/$DROP_DIR/$BUILD_ID/eclipse-platform-$BUILD_ID-win32-x86_64.zip
     popd
     fn-notarize-macbuild "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg
+    fn-notarize-macbuild "$CJE_ROOT/$DROP_DIR/$BUILD_ID" eclipse-platform-${BUILD_ID}-macosx-cocoa-arm64.dmg
   fi
 
   # gather platform sources
diff --git a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
index 9604a786c..92d0942a2 100755
--- a/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
+++ b/cje-production/mbscripts/mb310_gatherEquinoxParts.sh
@@ -32,9 +32,11 @@ 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-win32.win32.x86_64.zip $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID/EclipseRT-OSGi-StarterKit-$BUILD_ID-win32-win32-x86_64.zip
   popd
   fn-notarize-macbuild "$CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID" EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-x86_64.dmg
+  fn-notarize-macbuild "$CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID" EclipseRT-OSGi-StarterKit-$BUILD_ID-macosx-cocoa-arm_64.dmg
 fi
 
 # gather Equinox SDK
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 98990267d..771a90953 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -291,6 +291,11 @@
               <ws>cocoa</ws>
               <arch>x86_64</arch>
             </environment>
+            <environment>
+              <os>macosx</os>
+              <ws>cocoa</ws>
+              <arch>arm64</arch>
+            </environment>
           </environments>
         </configuration>
       </plugin>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index 27e1c5f98..6d61414ae 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -57,6 +57,11 @@
               <ws>cocoa</ws>
               <arch>x86_64</arch>
             </environment>
+            <environment>
+              <os>macosx</os>
+              <ws>cocoa</ws>
+              <arch>arm64</arch>
+            </environment>
           </environments>
         </configuration>
       </plugin>
@@ -226,6 +231,7 @@
             <version>${cbi-plugins.version}</version>
             <executions>
               <execution>
+                <id>dmg-x86_64</id>
                 <goals>
                   <goal>package-dmg</goal>
                 </goals>
@@ -238,6 +244,20 @@
                   <sign>true</sign>
                 </configuration>
               </execution>
+              <execution>
+                <id>dmg-arm64</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>
+                  <continueOnFail>true</continueOnFail>
+                  <timeoutMillis>600000</timeoutMillis> <!-- 10 min -->
+                  <continueOnFail>${macSigner.forceContinue}</continueOnFail> 
+                  <sign>true</sign>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>
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 5d0bb59cc..476102911 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
@@ -18,6 +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" />
   </target>
 
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
index 34c3eb74c..0f43d0892 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
@@ -131,6 +131,7 @@
             <version>${cbi-plugins.version}</version>
             <executions>
               <execution>
+                <id>dmg-x86_64</id>
                 <goals>
                   <goal>package-dmg</goal>
                 </goals>
@@ -143,6 +144,20 @@
                   <sign>true</sign>
                 </configuration>
               </execution>
+              <execution>
+                <id>dmg-arm64</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>
+                  <continueOnFail>true</continueOnFail>
+                  <timeoutMillis>600000</timeoutMillis> <!-- 10 min -->
+                  <continueOnFail>${macSigner.forceContinue}</continueOnFail> 
+                  <sign>true</sign>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index 20e23d6b9..59074c38f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -23,6 +23,9 @@ root.win32.win32.x86_64.permissions.755=eclipse.exe
 # configuration_roots complete (see bug 457071).
 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.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
 
 # from org.eclipse.equinox.core.feature
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
index cdf302144..7f31e395e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
@@ -130,6 +130,7 @@
             <version>${cbi-plugins.version}</version>
             <executions>
               <execution>
+                <id>dmg-x86_64</id>
                 <goals>
                   <goal>package-dmg</goal>
                 </goals>
@@ -142,6 +143,20 @@
                   <sign>true</sign>
                 </configuration>
               </execution>
+              <execution>
+                <id>dmg-arm64</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>
+                  <continueOnFail>true</continueOnFail>
+                  <timeoutMillis>600000</timeoutMillis> <!-- 10 min -->
+                  <continueOnFail>${macSigner.forceContinue}</continueOnFail>                  
+                  <sign>true</sign>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 52da16d4d..b11c44f48 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -243,6 +243,18 @@
     </condition>
     <condition
       property="platformArchive"
+      value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa-arm64.dmg">
+      <and>
+        <os family="mac" />
+        <os family="unix" />
+        <or>
+          <os arch="arm64" />
+          <os arch="arm64e" />
+        </or>
+      </and>
+    </condition>
+    <condition
+      property="platformArchive"
       value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa.dmg">
       <and>
         <os family="mac" />
@@ -1101,6 +1113,21 @@
           arg2="x86_64" />
       </and>
     </condition>
+    <condition
+      property="runtimeArchive"
+      value="eclipse-SDK-${buildIdToUse}-macosx-cocoa-arm64.dmg">
+      <and>
+        <equals
+          arg1="${os}"
+          arg2="macosx" />
+        <equals
+          arg1="${ws}"
+          arg2="cocoa" />
+        <equals
+          arg1="${arch}"
+          arg2="arm64" />
+      </and>
+    </condition>
     <echo message="runtimeArchive ${runtimeArchive} !!! " />
   </target>
 
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 46e6f884a..2c8fa9b96 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -174,16 +174,16 @@
     unless="skipInstall">
     <get
       verbose="${selectiveVerbose}"
-      src="${archiveLocation}/eclipse-SDK-${buildIdToUse}-macosx-cocoa-x86_64.dmg"
-      dest="${executionDir}/eclipse-SDK-${buildIdToUse}-macosx-cocoa-x86_64.dmg" />
+      src="${archiveLocation}/eclipse-SDK-${buildIdToUse}-macosx-cocoa-${osgi.arch}.dmg"
+      dest="${executionDir}/eclipse-SDK-${buildIdToUse}-macosx-cocoa-${osgi.arch}.dmg" />
     <get
       verbose="${selectiveVerbose}"
-      src="${archiveLocation}/eclipse-platform-${buildIdToUse}-macosx-cocoa-x86_64.dmg"
-      dest="${executionDir}/eclipse-platform-${buildIdToUse}-macosx-cocoa-x86_64.dmg" />
+      src="${archiveLocation}/eclipse-platform-${buildIdToUse}-macosx-cocoa-${osgi.arch}.dmg"
+      dest="${executionDir}/eclipse-platform-${buildIdToUse}-macosx-cocoa-${osgi.arch}.dmg" />
     <get
       verbose="${selectiveVerbose}"
-      src="${previousReleaseLocation}/eclipse-platform-${previousReleaseVersion}-macosx-cocoa-x86_64.dmg"
-      dest="${platformLocation}/eclipse-platform-${previousReleaseVersion}-macosx-cocoa-x86_64.dmg" />
+      src="${previousReleaseLocation}/eclipse-platform-${previousReleaseVersion}-macosx-cocoa-${osgi.arch}.dmg"
+      dest="${platformLocation}/eclipse-platform-${previousReleaseVersion}-macosx-cocoa-${osgi.arch}.dmg" />
   </target>
 
   <target
@@ -279,9 +279,14 @@
         <equals
           arg1="${osgi.ws}"
           arg2="cocoa" />
-        <equals
-          arg1="${osgi.arch}"
-          arg2="x86_64" />
+        <or>
+	        <equals
+	          arg1="${osgi.arch}"
+	          arg2="x86_64" />
+	        <equals
+	          arg1="${osgi.arch}"
+	          arg2="arm64" />
+       	</or>
       </and>
     </condition>
     <echo message="[DEBUG] in runTest2.xml: os ws arch ${osgi.os} ${osgi.ws} ${osgi.arch}" />