Changeset 767 for java/PlatformTools/src/net/oni2

Timestamp:

Mar 31, 2013, 6:02:09 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99y:

• Perhaps fixes launching Oni on MacOS

Location:

java/PlatformTools/src/net/oni2/platformtools

Files:

• PlatformInformation.java (modified) (1 diff)
• applicationinvoker/ApplicationInvoker.java (modified) (5 diffs)
• applicationinvoker/DotNet.java (modified) (1 diff)
• applicationinvoker/Wine.java (modified) (1 diff)

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

@@ -75 +75 @@
                                                 res = ApplicationInvoker.executeAndWait(
                                                                 EExeType.OSBINARY, null, new File("getconf"),
-                                                                params);
+                                                                params, false);
                                         } catch (IOException e) {
                                                 e.printStackTrace();

java/PlatformTools/src/net/oni2/platformtools/applicationinvoker/ApplicationInvoker.java

@@ -19 +19 @@
 public class ApplicationInvoker {
         private static Vector<String> buildCommandLine(EExeType exeType,
-                        File program, Vector<String> params)
+                        File program, Vector<String> params, boolean ignoreFileNotFound)
                         throws ERuntimeNotInstalledException, FileNotFoundException {
-                if (program.getParentFile() != null && !program.exists())
-                        throw new FileNotFoundException();
+                if (!ignoreFileNotFound)
+                        if (program.getParentFile() != null && !program.exists())
+                                throw new FileNotFoundException();
                 Vector<String> cmdLine = new Vector<String>();
                 switch (exeType) {
@@ -80 +81 @@
          * @param params
          *            List of command and arguments
+         * @param ignoreFileNotFound
+         *            Ignore if the program file is not found
          * @return Error code and list of output lines
          * @throws IOException
@@ -90 +93 @@
          */
         public static ApplicationInvocationResult executeAndWait(EExeType exeType,
-                        File workingDirectory, File program, Vector<String> params)
-                        throws ERuntimeNotInstalledException, FileNotFoundException,
-                        IOException {
+                        File workingDirectory, File program, Vector<String> params,
+                        boolean ignoreFileNotFound) throws ERuntimeNotInstalledException,
+                        FileNotFoundException, IOException {
                 return executeAndWait(workingDirectory,
-                                buildCommandLine(exeType, program, params));
+                                buildCommandLine(exeType, program, params, ignoreFileNotFound));
         }
 
@@ -108 +111 @@
          * @param params
          *            List of command and arguments
+         * @param ignoreFileNotFound
+         *            Ignore if the program file is not found
          * @throws ERuntimeNotInstalledException
          *             If the program to be executed requires a runtime which could
@@ -115 +120 @@
          */
         public static void execute(EExeType exeType, File workingDirectory,
-                        File program, Vector<String> params)
+                        File program, Vector<String> params, boolean ignoreFileNotFound)
                         throws ERuntimeNotInstalledException, FileNotFoundException {
-                execute(buildCommandLine(exeType, program, params), workingDirectory);
+                execute(buildCommandLine(exeType, program, params, ignoreFileNotFound),
+                                workingDirectory);
         }
 

java/PlatformTools/src/net/oni2/platformtools/applicationinvoker/DotNet.java

@@ -58 +58 @@
                                         ApplicationInvocationResult res = null;
                                         try {
-                                                res = ApplicationInvoker.executeAndWait(EExeType.OSBINARY, null, new File("which"), params);
+                                                res = ApplicationInvoker.executeAndWait(EExeType.OSBINARY, null, new File("which"), params, false);
                                         } catch (IOException e) {
                                                 e.printStackTrace();

java/PlatformTools/src/net/oni2/platformtools/applicationinvoker/Wine.java

@@ -36 +36 @@
                                 try {
                                         res = ApplicationInvoker.executeAndWait(EExeType.OSBINARY,
-                                                        null, new File("which"), params);
+                                                        null, new File("which"), params, false);
                                 } catch (IOException e) {
                                         e.printStackTrace();