Changeset 672 for AE/installer2/src/net/oni2/aeinstaller/backend/oni

Timestamp:

Feb 23, 2013, 6:40:47 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99q:

• Updates dialog: Updating the to-download-size on (un)checking updates to download
• Updates dialog: Show download size of individual updates
• Tool execution: Support for .NET tools (Mod_Info.cfg added ExeType flag)
• Depot backend: Ignore mod nodes with an empty package number field

File:

• AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java (modified) (3 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java

@@ -3 +3 @@
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
 import java.util.Vector;
 
+import net.oni2.aeinstaller.backend.DotNet;
 import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.AppExecution;
 import net.oni2.aeinstaller.backend.Settings;
-import net.oni2.aeinstaller.backend.Settings.Architecture;
 import net.oni2.aeinstaller.backend.Settings.Platform;
-import net.oni2.aeinstaller.backend.WinRegistry;
 
 /**
@@ -18 +15 @@
  */
 public class OniSplit {
-
-        /**
-         * @return is a .NET implementation installed?
-         */
-        public static boolean isDotNETInstalled() {
-                switch (Settings.getPlatform()) {
-                        case WIN:
-                                try {
-                                        int view = WinRegistry.KEY_WOW64_32KEY;
-                                        if (Settings.getArchitecture() == Architecture.AMD64)
-                                                view = WinRegistry.KEY_WOW64_64KEY;
-
-                                        Map<String, String> m = WinRegistry
-                                                        .readStringValues(
-                                                                        WinRegistry.HKEY_LOCAL_MACHINE,
-                                                                        "Software\\Microsoft\\NET Framework Setup\\NDP\\v2.0.50727",
-                                                                        view);
-                                        return m != null;
-                                } catch (IllegalArgumentException e) {
-                                        e.printStackTrace();
-                                } catch (IllegalAccessException e) {
-                                        e.printStackTrace();
-                                } catch (InvocationTargetException e) {
-                                        e.printStackTrace();
-                                } catch (Exception e) {
-                                        if (!e.getMessage()
-                                                        .equals("Registry access not supported (not a Windows OS?)."))
-                                                e.printStackTrace();
-                                }
-                                return false;
-                        case MACOS:
-                        case LINUX:
-                                Vector<String> cmd = new Vector<String>();
-                                cmd.add("which");
-                                cmd.add("mono");
-                                Vector<String> res = null;
-                                try {
-                                        res = AppExecution.executeAndWait(cmd);
-                                } catch (IOException e) {
-                                        e.printStackTrace();
-                                }
-                                if (res != null) {
-                                        if (res.get(0).startsWith("/")
-                                                        && res.get(0).endsWith("mono")) {
-                                                return true;
-                                        }
-                                }
-                                return false;
-                        default:
-                                return false;
-                }
-        }
 
         /**
@@ -209 +154 @@
         private static Vector<String> getProgramInvocation() {
                 Vector<String> res = new Vector<String>();
-                if (Settings.getPlatform() != Platform.WIN)
-                        res.add("mono");
+                if (DotNet.getRuntimeExe().length() > 0)
+                        res.add(DotNet.getRuntimeExe());
                 res.add(getProgramFile().getPath());
                 return res;