Changeset 594 for AE/installer2/src/net/oni2/aeinstaller/backend

Timestamp:

Jan 1, 2013, 8:27:17 PM (12 years ago)

Author:

alloc

Message:

AEI2: .NET detection

Location:

AE/installer2/src/net/oni2/aeinstaller/backend

Files:

• OniSplit.java (added)
• Settings.java (modified) (3 diffs)
• SizeFormatter.java (added)
• WinRegistry.java (added)
• app_launcher (added)
• app_launcher/LongRunningExecution.java (added)
• app_launcher/QuickAppExecution.java (added)

AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java

@@ -10 +10 @@
 import java.net.URLDecoder;
 import java.util.HashMap;
+import java.util.Vector;
+
+import net.oni2.aeinstaller.backend.app_launcher.QuickAppExecution;
 
 import com.thoughtworks.xstream.XStream;
@@ -26 +29 @@
          * @author Christian Illy
          */
+        public enum Architecture {
+                /**
+                 * 32 bit
+                 */
+                X86,
+                /**
+                 * 64 bit
+                 */
+                AMD64
+        };
+
+        /**
+         * @author Christian Illy
+         */
         public enum Platform {
                 /**
@@ -75 +92 @@
         public static boolean getDebug() {
                 return debugRun;
+        }
+
+        /**
+         * @return Processor architecture
+         */
+        public static Architecture getArchitecture() {
+                switch (getPlatform()) {
+                        case WIN:
+                                String arch = System.getenv("PROCESSOR_ARCHITECTURE")
+                                                .toLowerCase();
+                                if (arch.startsWith("x86"))
+                                        return Architecture.X86;
+                                return Architecture.AMD64;
+                        case MACOS:
+                        case LINUX:
+                                Vector<String> cmd = new Vector<String>();
+                                cmd.add("getconf");
+                                cmd.add("LONG_BIT");
+                                Vector<String> res = null;
+                                try {
+                                        res = QuickAppExecution.execute(cmd);
+                                } catch (IOException e) {
+                                        // TODO Auto-generated catch block
+                                        e.printStackTrace();
+                                }
+                                if (res != null) {
+                                        if (res.get(0).equals("64"))
+                                                return Architecture.AMD64;
+                                }
+                                return Architecture.X86;
+                        default:
+                                return null;
+                }
         }