[576898] Support a native installer for macosx aarch64

https://bugs.eclipse.org/bugs/show_bug.cgi?id=576898
eclipse-oomph · Oct 26, 2021 · 2f5a0ce · 2f5a0ce
1 parent 5feb93d
commit 2f5a0ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/plugins/org.eclipse.oomph.jreinfo/src/org/eclipse/oomph/jreinfo/JRE.java b/plugins/org.eclipse.oomph.jreinfo/src/org/eclipse/oomph/jreinfo/JRE.java
@@ -182,6 +182,12 @@ public boolean isMatch(JREFilter filter)
       return false;
     }
 
+    String filterArch = filter.getArch();
+    if (!StringUtil.isEmpty(filterArch) && !StringUtil.isEmpty(arch) && !filterArch.equals(arch))
+    {
+      return false;
+    }
+
     Boolean filterJDK = filter.isJDK();
     if (filterJDK != null && jdk != filterJDK.booleanValue())
     {
@@ -237,12 +243,6 @@ public boolean isMatch(JREFilter filter)
       return false;
     }
 
-    String filterArch = filter.getArch();
-    if (!StringUtil.isEmpty(filterArch) && !StringUtil.isEmpty(arch) && !filterArch.equals(arch))
-    {
-      return false;
-    }
-
     return true;
   }
 

diff --git a/plugins/org.eclipse.oomph.jreinfo/src/org/eclipse/oomph/jreinfo/JREFilter.java b/plugins/org.eclipse.oomph.jreinfo/src/org/eclipse/oomph/jreinfo/JREFilter.java
@@ -188,6 +188,7 @@ public String toString()
     if (!StringUtil.isEmpty(arch))
     {
       builder.append(arch);
+      builder.append(" "); //$NON-NLS-1$
     }
 
     if (jdk != null)

diff --git a/plugins/org.eclipse.oomph.util/src/org/eclipse/oomph/util/OS.java b/plugins/org.eclipse.oomph.util/src/org/eclipse/oomph/util/OS.java
@@ -296,11 +296,6 @@ public static void close(Closeable closeable)
 
   private static OS create()
   {
-    if (Boolean.FALSE)
-    {
-      return new Mac(Platform.WS_COCOA, Platform.ARCH_AARCH64);
-    }
-
     String os = Platform.getOS();
     String ws = Platform.getWS();
     String arch = Platform.getOSArch();