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

Timestamp:

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

Author:

alloc

Message:

AEI2: .NET detection

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• AEInstaller2.java (modified) (2 diffs)
• backend/OniSplit.java (added)
• backend/Settings.java (modified) (3 diffs)
• backend/SizeFormatter.java (added)
• backend/WinRegistry.java (added)
• backend/app_launcher (added)
• backend/app_launcher/LongRunningExecution.java (added)
• backend/app_launcher/QuickAppExecution.java (added)
• gui/MainWin.properties (modified) (1 diff)
• gui/MainWin.yml (modified) (1 diff)

AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.32
+appversion=0.33
 
 invalidPath.title=Wrong directory

AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

@@ -17 +17 @@
 import javax.swing.UIManager.LookAndFeelInfo;
 
+import net.oni2.aeinstaller.backend.OniSplit;
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Platform;
@@ -126 +127 @@
                 System.out.println("ValidPath: "
                                 + StuffToRefactorLater.verifyRunningDirectory());
+                System.out.println("Platform:  " + Settings.getPlatform());
+                System.out.println("Architect: " + Settings.getArchitecture());
+                System.out.println(".NET:      " + OniSplit.isDotNETInstalled());
 
                 if (!StuffToRefactorLater.verifyRunningDirectory()) {

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;
+                }
         }
 

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.properties

@@ -21 +21 @@
 btnRevertSelection.text=Revert selection
 btnRevertSelection.tooltip=Select mods which are currently installed
-lblModTypes.text=Mod types: 
+lblModTypes.text=Mod type: 
 
 lblSubmitter.text=Submitter:

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml

@@ -67 +67 @@
         rowConstraints: grow
         constraints:
-            - tools: dock north
             - contents: grow
+
+#            - tools: dock north