Changeset 404 for trunk/org.modelica.mdt.omc/src/org/modelica/mdt

Timestamp:

03/09/06 09:57:55 (19 years ago)

Author:

boris

Message:

• fixed a omc-binary-lookup bug related to when MDT is instructed to use OPENMODELICAHOME to find the binary

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

@@ -226 +226 @@
              * by checking in it's varius subdirectory for the omc binary file
              */
-            logOMCStatus("Using standard path to omc-binary");
+            logOMCStatus("Using OPENMODELICAHOME environment variable to find omc-binary");
             
             /* 
@@ -248 +248 @@
             for (String subdir : subdirs)
             {
-                File file = new File(openModelicaHome + 
-                        subdir + File.separator + binaryName);
+            
+                String path = omcWorkingDirectory.getAbsolutePath() + File.separator;
+                path += subdir.equals("") ? binaryName :  subdir + File.separator + binaryName;
+
+                File file = new File(path); 
 
                 if (file.exists())
@@ -261 +264 @@
             if (omcBinary == null)
             {
-                logOMCStatus("Could not fine omc-binary on the standard path");
+                logOMCStatus("Could not fine omc-binary on the OPENMODELICAHOME path");
                 throw new ConnectException("Unable to start the OpenModelica Compiler, binary not found");
             }