Correct paths for the latest openmodelica

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@23380 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
index 673e512f3f19044ad2bdc24ca08001a2baac3330..fb5d4309d463b1cdaf56ca58750658462c96d68b 100644 (file)
--- a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
+++ b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
@@ -105,7 +105,7 @@ public class ModelicaManager {
                     if(entry != null) {\r
                         URL fileURL = FileLocator.toFileURL(entry);\r
                         File root = new File( URLDecoder.decode(fileURL.getPath(), "UTF-8") );\r
-                        File f = new File(root, "OpenModelica1.8.0");\r
+                        File f = new File(root, "OpenModelica1.7.0");\r
                         return f;\r
                     }\r
                 }\r
@@ -122,7 +122,7 @@ public class ModelicaManager {
             case SUN:\r
                 return new File("/usr/bin/omc");\r
             case WINDOWS:\r
-                return new File("c:/OpenModelica1.8.0");\r
+                return new File("c:/OpenModelica1.7.0");\r
             default:\r
                 throw new UnsatisfiedLinkError("Unsupported operating system: " + os);\r
         }\r
@@ -282,9 +282,10 @@ public class ModelicaManager {
             Map<String, String> env = processBuilder.environment();\r
             \r
             env.put("OPENMODELICAHOME", openModelicaHome.getAbsolutePath());\r
-            env.put("OPENMODELICALIBRARY", openModelicaHome.getAbsolutePath() + "\\lib\\omlibrary\\msl31");\r
+            env.put("OPENMODELICALIBRARY", openModelicaHome.getAbsolutePath() + "\\lib\\omlibrary");\r
             env.put("OMPATH", openModelicaHome.getAbsolutePath() + "\\bin");\r
-            env.put("Path", env.get("Path") + System.getProperty("path.separator") + openModelicaHome.getAbsolutePath() + "\\MinGW\\lib");\r
+            env.put("MINGW", openModelicaHome.getAbsolutePath() + "\\MinGW");\r
+            env.put("PATH", env.get("PATH") + System.getProperty("path.separator") + openModelicaHome.getAbsolutePath() + "\\MinGW\\lib");\r
             \r
             // Start the building process\r
             Process process = processBuilder.start();\r
@@ -333,7 +334,8 @@ public class ModelicaManager {
             env.put("OPENMODELICAHOME", openModelicaHome.getAbsolutePath());\r
             env.put("OPENMODELICALIBRARY", openModelicaHome.getAbsolutePath() + "\\lib\\omlibrary\\msl31");\r
             env.put("OMPATH", openModelicaHome.getAbsolutePath() + "\\bin");\r
-            env.put("Path", env.get("Path") + System.getProperty("path.separator") + openModelicaHome.getAbsolutePath() + "\\bin"\r
+            env.put("MINGW", openModelicaHome.getAbsolutePath() + "\\MinGW");\r
+            env.put("PATH", env.get("PATH") + System.getProperty("path.separator") + openModelicaHome.getAbsolutePath() + "\\bin"\r
                     + System.getProperty("path.separator") + openModelicaHome.getAbsolutePath() + "\\MinGW\\lib");\r
            \r
             // Simulate model\r