Add support for Apple silicon to the durian-swt enums (#13)

Author: nedtwigg

CHANGES.md

@@ -1,6 +1,8 @@
 # DurianSwt releases
 
 ## [Unreleased]
+### Added
+- Support for Apple Silicon in the `OS`, `Arch`, and `SwtPlatform` classes. ([#13](https://github.com/diffplug/durian-swt/pull/13))
 
 ## [3.3.1] - 2020-01-13
 ### Fixed

build.gradle

@@ -43,6 +43,10 @@ subprojects { subProject ->
 			compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 			testImplementation "junit:junit:$VER_JUNIT"
 		}
+		tasks.register('osMain', JavaExec) {
+			classpath = sourceSets.main.runtimeClasspath
+			main = 'com.diffplug.common.swt.os.OS'
+		}
 	} else {
 		apply plugin: 'com.diffplug.gradle.eclipse.mavencentral'
 		String platformCode = project.name.substring('durian-swt.'.length())

durian-swt.os/src/main/java/com/diffplug/common/swt/os/Arch.java

@@ -17,7 +17,7 @@
 
 /** Enum for handling different processor architectures supported by SWT. */
 public enum Arch {
-	x86, x64;
+	x86, x64, arm64;
 
 	/** Returns the appropriate value depending on the arch. */
 	public <T> T x86x64(T val86, T val64) {
@@ -31,6 +31,32 @@ public <T> T x86x64(T val86, T val64) {
 		}
 	}
 
+	/** Returns the appropriate value depending on the arch. */
+	public <T> T x64arm64(T val64, T arm64) {
+		switch (this) {
+		case x64:
+			return val64;
+		case arm64:
+			return arm64;
+		default:
+			throw unsupportedException(this);
+		}
+	}
+
+	/** Returns the appropriate value depending on the arch. */
+	public <T> T x86x64arm64(T val86, T val64, T arm64) {
+		switch (this) {
+		case x86:
+			return val86;
+		case x64:
+			return val64;
+		case arm64:
+			return arm64;
+		default:
+			throw unsupportedException(this);
+		}
+	}
+
 	/** Returns the Arch for the native platform: 32-bit JVM on 64-bit Windows returns Arch.x64. */
 	public static Arch getNative() {
 		return OS.getNative().getArch();

durian-swt.os/src/main/java/com/diffplug/common/swt/os/OS.java

@@ -16,12 +16,17 @@
 package com.diffplug.common.swt.os;
 
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Locale;
 
 /** Enum representing an OS and its underlying CPU architecture. */
 public enum OS {
-	WIN_x64, WIN_x86, LINUX_x64, LINUX_x86, MAC_x64;
+	WIN_x64, WIN_x86, LINUX_x64, LINUX_x86, MAC_x64, MAC_silicon;
 
 	public boolean isWindows() {
 		return this == WIN_x64 || this == WIN_x86;
@@ -32,7 +37,7 @@ public boolean isLinux() {
 	}
 
 	public boolean isMac() {
-		return this == MAC_x64;
+		return this == MAC_x64 || this == MAC_silicon;
 	}
 
 	public boolean isMacOrLinux() {
@@ -62,6 +67,8 @@ public Arch getArch() {
 		case WIN_x86:
 		case LINUX_x86:
 			return Arch.x86;
+		case MAC_silicon:
+			return Arch.arm64;
 		default:
 			throw unsupportedException(this);
 		}
@@ -74,7 +81,7 @@ public String os() {
 
 	/** SWT-style x86/x86_64 */
 	public String arch() {
-		return getArch().x86x64("x86", "x86_64");
+		return getArch().x86x64arm64("x86", "x86_64", "aarch64");
 	}
 
 	/** os().arch() */
@@ -84,7 +91,7 @@ public String osDotArch() {
 
 	/** windowing.os.arch */
 	public String toSwt() {
-		return winMacLinux("win32", "cocoa", "gtk") + "." + winMacLinux("win32", "macosx", "linux") + "." + getArch().x86x64("x86", "x86_64");
+		return winMacLinux("win32", "cocoa", "gtk") + "." + winMacLinux("win32", "macosx", "linux") + "." + getArch().x86x64arm64("x86", "x86_64", "aarch64");
 	}
 
 	/** Returns the native OS: 32-bit JVM on 64-bit Windows returns OS.WIN_64. */
@@ -105,9 +112,8 @@ private static OS calculateNative() {
 		boolean isWin = os_name.contains("win");
 		boolean isMac = os_name.contains("mac");
 		boolean isLinux = Arrays.asList("nix", "nux", "aix").stream().anyMatch(os_name::contains);
-
 		if (isMac) {
-			return MAC_x64;
+			return exec("uname", "-a").contains("_ARM64_") ? MAC_silicon : MAC_x64;
 		} else if (isWin) {
 			boolean is64bit = System.getenv("ProgramFiles(x86)") != null;
 			return is64bit ? WIN_x64 : WIN_x86;
@@ -128,15 +134,38 @@ private static OS calculateNative() {
 		}
 	}
 
+	private static String exec(String... cmd) {
+		try {
+			Process process = Runtime.getRuntime().exec(new String[]{"uname", "-a"});
+			ByteArrayOutputStream output = new ByteArrayOutputStream();
+			drain(process.getInputStream(), output);
+			return new String(output.toByteArray(), StandardCharsets.UTF_8);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private static void drain(InputStream input, OutputStream output) throws IOException {
+		byte[] buf = new byte[1024];
+		int numRead;
+		while ((numRead = input.read(buf)) != -1) {
+			output.write(buf, 0, numRead);
+		}
+	}
+
 	private static final OS RUNNING_OS = calculateRunning();
 
 	/** Calculates the running OS. */
 	private static OS calculateRunning() {
 		Arch runningArch = runningJvm();
-		return NATIVE_OS.winMacLinux(
-				runningArch.x86x64(OS.WIN_x86, OS.WIN_x64),
-				OS.MAC_x64,
-				runningArch.x86x64(OS.LINUX_x86, OS.LINUX_x64));
+		OS runningOs = NATIVE_OS.winMacLinux(
+				runningArch.x86x64arm64(OS.WIN_x86, OS.WIN_x64, null),
+				runningArch.x86x64arm64(null, OS.MAC_x64, OS.MAC_silicon),
+				runningArch.x86x64arm64(OS.LINUX_x86, OS.LINUX_x64, null));
+		if (runningOs == null) {
+			throw new IllegalArgumentException("Unsupported OS/Arch combo: " + runningOs + " " + runningArch);
+		}
+		return runningOs;
 	}
 
 	/** Returns the arch of the currently running JVM. */
@@ -146,14 +175,19 @@ private static Arch runningJvm() {
 		case "32":
 			return Arch.x86;
 		case "64":
-			return Arch.x64;
+			return "aarch64".equals(System.getProperty("os.arch")) ? Arch.arm64 : Arch.x64;
 		default:
-			throw new IllegalArgumentException(sunArchDataModel);
+			throw new IllegalArgumentException("Expcted 32 or 64, was " + sunArchDataModel);
 		}
 	}
 
 	/** Returns an UnsupportedOperationException for the given OS. */
 	public static UnsupportedOperationException unsupportedException(OS os) {
 		return new UnsupportedOperationException("Operating system '" + os + "' is not supported.");
 	}
+
+	public static void main(String[] args) {
+		System.out.println("native=" + OS.getNative());
+		System.out.println("running=" + OS.getRunning());
+	}
 }

durian-swt.os/src/main/java/com/diffplug/common/swt/os/SwtPlatform.java

@@ -129,7 +129,7 @@ public static SwtPlatform getRunning() {
 	public static SwtPlatform fromOS(OS raw) {
 		String ws = raw.winMacLinux("win32", "cocoa", "gtk");
 		String os = raw.winMacLinux("win32", "macosx", "linux");
-		String arch = raw.getArch().x86x64("x86", "x86_64");
+		String arch = raw.getArch().x86x64arm64("x86", "x86_64", "aarch64");
 		return new SwtPlatform(ws, os, arch);
 	}