From cbe3a082b547b80db15a1c630d0c521483c0baa2 Mon Sep 17 00:00:00 2001 From: lempinen Date: Thu, 1 Dec 2011 07:43:28 +0000 Subject: [PATCH] Correct paths for the latest openmodelica git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@23380 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../src/org/simantics/modelica/ModelicaManager.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java index 673e512f..fb5d4309 100644 --- 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) { URL fileURL = FileLocator.toFileURL(entry); File root = new File( URLDecoder.decode(fileURL.getPath(), "UTF-8") ); - File f = new File(root, "OpenModelica1.8.0"); + File f = new File(root, "OpenModelica1.7.0"); return f; } } @@ -122,7 +122,7 @@ public class ModelicaManager { case SUN: return new File("/usr/bin/omc"); case WINDOWS: - return new File("c:/OpenModelica1.8.0"); + return new File("c:/OpenModelica1.7.0"); default: throw new UnsatisfiedLinkError("Unsupported operating system: " + os); } @@ -282,9 +282,10 @@ public class ModelicaManager { Map env = processBuilder.environment(); env.put("OPENMODELICAHOME", openModelicaHome.getAbsolutePath()); - env.put("OPENMODELICALIBRARY", openModelicaHome.getAbsolutePath() + "\\lib\\omlibrary\\msl31"); + env.put("OPENMODELICALIBRARY", openModelicaHome.getAbsolutePath() + "\\lib\\omlibrary"); env.put("OMPATH", openModelicaHome.getAbsolutePath() + "\\bin"); - env.put("Path", env.get("Path") + System.getProperty("path.separator") + openModelicaHome.getAbsolutePath() + "\\MinGW\\lib"); + env.put("MINGW", openModelicaHome.getAbsolutePath() + "\\MinGW"); + env.put("PATH", env.get("PATH") + System.getProperty("path.separator") + openModelicaHome.getAbsolutePath() + "\\MinGW\\lib"); // Start the building process Process process = processBuilder.start(); @@ -333,7 +334,8 @@ public class ModelicaManager { env.put("OPENMODELICAHOME", openModelicaHome.getAbsolutePath()); env.put("OPENMODELICALIBRARY", openModelicaHome.getAbsolutePath() + "\\lib\\omlibrary\\msl31"); env.put("OMPATH", openModelicaHome.getAbsolutePath() + "\\bin"); - env.put("Path", env.get("Path") + System.getProperty("path.separator") + openModelicaHome.getAbsolutePath() + "\\bin" + env.put("MINGW", openModelicaHome.getAbsolutePath() + "\\MinGW"); + env.put("PATH", env.get("PATH") + System.getProperty("path.separator") + openModelicaHome.getAbsolutePath() + "\\bin" + System.getProperty("path.separator") + openModelicaHome.getAbsolutePath() + "\\MinGW\\lib"); // Simulate model -- 2.47.1