Changeset 1077 for java/PlatformTools/src/net

Timestamp:

Oct 16, 2017, 5:09:22 PM (7 years ago)

Author:

alloc

Message:

Fixed #109

File:

• java/PlatformTools/src/net/oni2/platformtools/PlatformInformation.java (modified) (3 diffs)

java/PlatformTools/src/net/oni2/platformtools/PlatformInformation.java

@@ -26 +26 @@
                  * 64 bit
                  */
-                AMD64
+                AMD64,
+                /**
+                 * PPC
+                 */
+                PPC
         }
 
@@ -59 +63 @@
         public static Architecture getArchitecture() {
                 if (architecture == null) {
+                        Vector<String> params = new Vector<String>();
+                        ApplicationInvocationResult res = null;
+
                         switch (getPlatform()) {
                                 case WIN:
@@ -68 +75 @@
                                         break;
                                 case MACOS:
+                                        params.add("-m");
+                                        try {
+                                                res = ApplicationInvoker.executeAndWait(
+                                                                EExeType.OSBINARY, null, new File("uname"),
+                                                                params, false);
+                                        } catch (IOException e) {
+                                                e.printStackTrace();
+                                        } catch (ERuntimeNotInstalledException e) {
+                                                e.printStackTrace();
+                                        }
+                                        architecture = Architecture.AMD64;
+                                        if (res != null) {
+                                                if (res.output.get(0).toLowerCase().contains("power macintosh"))
+                                                        architecture = Architecture.PPC;
+                                        }
+                                        break;
                                 case LINUX:
-                                        Vector<String> params = new Vector<String>();
                                         params.add("LONG_BIT");
-                                        ApplicationInvocationResult res = null;
                                         try {
                                                 res = ApplicationInvoker.executeAndWait(