Changeset 393 for trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc/OMCProxy.java

Timestamp:

03/01/06 17:13:31 (19 years ago)

Author:

remar

Message:

• IModelicaClass now provides an ISignature of its inputs and outputs
• OMCProxy now tries three (3) different paths to omc
• Context Information now takes imports and the Standard Library in consideration
• ModelicaImport? now works better on Standard Library items

File:

• trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc/OMCProxy.java (modified) (3 diffs)

trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc/OMCProxy.java

@@ -190 +190 @@
     private static void startServer() throws ConnectException
     {
-        String pathToOmc = null;
+        String[] pathsToOmc = new String[3];
         File workingDirectory;
 
@@ -208 +208 @@
         if(os.equals("Unix"))
         {
-            pathToOmc = omHome + "/bin/omc";
+            pathsToOmc[0] = omHome + "/bin/omc";
+            pathsToOmc[1] = omHome + "/omc";
+            pathsToOmc[2] = omHome + "/Compiler/omc";
         }
         else if(os.equals("Windows"))
         {
-            pathToOmc = omHome + "\\bin\\omc.exe";
+            pathsToOmc[0] = omHome + "\\bin\\omc.exe";
+            pathsToOmc[1] = omHome + "\\omc.exe";
+            pathsToOmc[2] = omHome + "\\Compiler\\omc.exe";
         }
         
@@ -230 +234 @@
         }
         
-        String command[] = { pathToOmc, "+d=interactiveCorba" };
-        try
-        {
-            logOMCStatus("Running command " + command[0] + " " + command[1]);
-            Runtime.getRuntime().exec(command, null, workingDirectory);
-            logOMCStatus("Command run successfully.");
-        }
-        catch(IOException e)
-        {
-            /*
-             * If we fail to start the compiler, maybe the executable is in
-             * the Compiler directory (if we've compiled the compiler from
-             * source). Try starting OMC from this secondary location.
-             */
-            logOMCStatus("Error running command " + e.getMessage()
-                    + ", trying alternative path to the binary.");
-            String secondaryPathToOmc = null;
+        for(int i = 0;i < 3;i++)
+        {
+            String command[] = { pathsToOmc[i], "+d=interactiveCorba" };
             try
             {
-                if(os.equals("Unix"))
-                {
-                    secondaryPathToOmc = omHome + "/build/bin/omc";
-                }
-                else if(os.equals("Windows"))
-                {
-                    secondaryPathToOmc = omHome + "\\build\\bin\\omc.exe";
-                }
-
-                command = 
-                    new String[]{secondaryPathToOmc, "+d=interactiveCorba"};
-                logOMCStatus("Running command " 
-                        + command[0] + " " + command[1]);
+                logOMCStatus("Running command " + command[0] + " " + command[1]);
                 Runtime.getRuntime().exec(command, null, workingDirectory);
                 logOMCStatus("Command run successfully.");
-            }
-            catch(IOException ex)
-            {
-                logOMCStatus("Unable to start OMC, giving up."); 
-                throw new ConnectException
-                    ("Unable to start the OpenModelica Compiler. "
-                     + "Tried starting " + pathToOmc
-                     + " and " + secondaryPathToOmc);
-            }
+                
+                break; /* exit the for loop, we've started OMC */
+            }
+            catch(IOException e)
+            {
+                if(i < 2)
+                {
+                    logOMCStatus("Error running command " + e.getMessage()
+                            + ", trying alternative path to the binary.");
+                    
+                    /* If the call failed, try another path to the compiler */
+                }
+                else
+                {
+                    /* If all the paths to OMC were wrong, throw an exception */
+                    
+                    logOMCStatus("Unable to start OMC, giving up."); 
+                    throw new ConnectException
+                        ("Unable to start the OpenModelica Compiler. "
+                         + "Tried starting " + pathsToOmc[0] + ", " 
+                         + pathsToOmc[1] + " and " + pathsToOmc[2]);
+                }
+            }           
         }