From 437c71e44740e11183348d0f677ebf86d663d6b2 Mon Sep 17 00:00:00 2001 From: miettinen Date: Tue, 14 Apr 2015 08:34:32 +0000 Subject: [PATCH] Changed the OpenModelica version to 1.9.2 (refs #5759). Renamed the OpenModelica plugin, since the full path in an installation becomes otherwise to long. Changed the default solver of Sysdyn to internal. git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@31169 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../src/org/simantics/modelica/ModelicaManager.java | 12 ++++++------ org.simantics.sysdyn.feature/feature.xml | 4 ++-- org.simantics.sysdyn.ontology/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF | 2 +- org.simantics.sysdyn.ui/.classpath | 2 +- org.simantics.sysdyn.ui/.project | 8 +++++++- .../.settings/org.eclipse.jdt.core.prefs | 10 +++++++--- org.simantics.sysdyn.ui/META-INF/MANIFEST.MF | 4 ++-- org.simantics.sysdyn.ui/plugin.properties | 2 +- org.simantics.sysdyn.ui/plugin_customization.ini | 2 +- .../ui/preferences/ModelicaPreferencePage.java | 4 ++-- org.simantics.sysdyn.ui/sysdyn.product | 4 ++-- org.simantics.sysdyn/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.simantics.sysdyn/META-INF/MANIFEST.MF | 4 ++-- .../sysdyn/manager/SysdynGameExperiment.java | 4 ++-- .../org/simantics/sysdyn/solver/SolverSettings.java | 2 +- 18 files changed, 45 insertions(+), 35 deletions(-) diff --git a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java index ae40d665..09cd5adb 100644 --- a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java +++ b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Association for Decentralized Information Management in + * Copyright (c) 2010, 2012, 2015 Association for Decentralized Information Management in * Industry THTH ry. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -61,7 +61,7 @@ import org.xml.sax.SAXException; */ public class ModelicaManager { - private static final String OM_BUILTIN = "OpenModelica1.9.0"; + private static final String OM_BUILTIN = "OM192"; public enum OSType { APPLE, LINUX, SUN, WINDOWS, UNKNOWN @@ -155,7 +155,7 @@ public class ModelicaManager { } public static String getOMVersion(File home) { - return getProcessOutput(runOMC(home, home, "++v")); + return getProcessOutput(runOMC(home, home, "--version")); } public static String getDefaultOMVersion() { @@ -217,7 +217,7 @@ public class ModelicaManager { } public static File getBuiltinOMHome() { - Bundle bundle = Platform.getBundle("org.simantics.openmodelica.win32"); + Bundle bundle = Platform.getBundle("org.simantics.om.win32"); if (bundle != null) { try { File omHome = new File(FileLocator.getBundleFile(bundle), OM_BUILTIN); @@ -643,10 +643,10 @@ public class ModelicaManager { // Create simulation files from the full description ArrayList parameters = new ArrayList(); - parameters.add("+s"); + parameters.add("-s"); parameters.add(simulationLocation.fullModelFile.getAbsolutePath()); - Process process = runOMC(simulationLocation.omHome, simulationLocation.fullModelDir, "+s", simulationLocation.fullModelFile.getAbsolutePath()); + Process process = runOMC(simulationLocation.omHome, simulationLocation.fullModelDir, "-s", simulationLocation.fullModelFile.getAbsolutePath()); process.waitFor(); diff --git a/org.simantics.sysdyn.feature/feature.xml b/org.simantics.sysdyn.feature/feature.xml index fe512f8f..dd9cd543 100644 --- a/org.simantics.sysdyn.feature/feature.xml +++ b/org.simantics.sysdyn.feature/feature.xml @@ -13,7 +13,7 @@ @@ -106,7 +106,7 @@ unpack="false"/> - + diff --git a/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs b/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs index 888b17ed..6e070f4f 100644 --- a/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ #Thu Jul 22 15:15:41 EEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF index dfa33be9..277f2c58 100644 --- a/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF +++ b/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF @@ -20,6 +20,6 @@ Require-Bundle: org.simantics.layer0, org.simantics.silk.ontology;bundle-version="1.0.0", org.simantics.spreadsheet.ontology;bundle-version="1.1.0", org.simantics.workbench.ontology;bundle-version="1.2.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.simantics.sysdyn Bundle-Vendor: VTT Technical Reserarch Centre of Finland diff --git a/org.simantics.sysdyn.ui/.classpath b/org.simantics.sysdyn.ui/.classpath index 8a8f1668..b1dabee3 100644 --- a/org.simantics.sysdyn.ui/.classpath +++ b/org.simantics.sysdyn.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.simantics.sysdyn.ui/.project b/org.simantics.sysdyn.ui/.project index 2ebd5691..785f1265 100644 --- a/org.simantics.sysdyn.ui/.project +++ b/org.simantics.sysdyn.ui/.project @@ -1,10 +1,15 @@ org.simantics.sysdyn.ui - + JavaCC Nature + + sf.eclipse.javacc.javaccbuilder + + + org.eclipse.jdt.core.javabuilder @@ -24,5 +29,6 @@ org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + sf.eclipse.javacc.javaccnature diff --git a/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs b/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs index f287d53c..838bd9d6 100644 --- a/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF index 67255fcb..d334c39d 100644 --- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF +++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Simantics System Dynamics UI Bundle-SymbolicName: org.simantics.sysdyn.ui;singleton:=true -Bundle-Version: 1.8.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Version: 1.9.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2", org.simantics.scenegraph;bundle-version="0.9.0", org.junit4;bundle-version="4.5.0";resolution:=optional, diff --git a/org.simantics.sysdyn.ui/plugin.properties b/org.simantics.sysdyn.ui/plugin.properties index 150b0012..ad16535d 100644 --- a/org.simantics.sysdyn.ui/plugin.properties +++ b/org.simantics.sysdyn.ui/plugin.properties @@ -1,6 +1,6 @@ about.text = Simantics System Dynamics\n\ \n\ -Version 1.8.3\n\ +Version 1.9\n\ \n\ Copyright (c) 2014 Association for Decentralized Information Management in Industry THTH ry.\n\ \n\ diff --git a/org.simantics.sysdyn.ui/plugin_customization.ini b/org.simantics.sysdyn.ui/plugin_customization.ini index 2d6b595d..f2954cf6 100644 --- a/org.simantics.sysdyn.ui/plugin_customization.ini +++ b/org.simantics.sysdyn.ui/plugin_customization.ini @@ -1,4 +1,4 @@ org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = false org.eclipse.ui/DOCK_PERSPECTIVE_BAR=right -org.simantics.sysdyn.solver.preferences/SOLVER_TYPE=OPENMODELICA \ No newline at end of file +org.simantics.sysdyn.solver.preferences/SOLVER_TYPE=INTERNAL \ No newline at end of file diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/ModelicaPreferencePage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/ModelicaPreferencePage.java index af438d9a..0ab5acee 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/ModelicaPreferencePage.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/ModelicaPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Association for Decentralized Information Management in + * Copyright (c) 2013, 2015 Association for Decentralized Information Management in * Industry THTH ry. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -138,7 +138,7 @@ public class ModelicaPreferencePage extends FieldEditorPreferencePage implements } private void updatePath(String newValue) { - if((installed != null && newValue.equals(installed.getAbsolutePath()) || newValue.equals(builtIn.getAbsolutePath()))) { + if((installed != null && newValue.equals(installed.getAbsolutePath())) || (builtIn != null && newValue.equals(builtIn.getAbsolutePath()))) { path.setStringValue(newValue); path.setEnabled(false, getFieldEditorParent()); } else { diff --git a/org.simantics.sysdyn.ui/sysdyn.product b/org.simantics.sysdyn.ui/sysdyn.product index 7558ac46..153d2381 100644 --- a/org.simantics.sysdyn.ui/sysdyn.product +++ b/org.simantics.sysdyn.ui/sysdyn.product @@ -1,7 +1,7 @@ - + @@ -121,7 +121,7 @@ This Agreement is governed by the laws of the State of New York and the intellec - + diff --git a/org.simantics.sysdyn/.classpath b/org.simantics.sysdyn/.classpath index 8a8f1668..b1dabee3 100644 --- a/org.simantics.sysdyn/.classpath +++ b/org.simantics.sysdyn/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs b/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs index 785aae6f..009f2581 100644 --- a/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs +++ b/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ #Mon Nov 16 15:37:44 EET 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/org.simantics.sysdyn/META-INF/MANIFEST.MF b/org.simantics.sysdyn/META-INF/MANIFEST.MF index 9c5a86f7..7f5330ed 100644 --- a/org.simantics.sysdyn/META-INF/MANIFEST.MF +++ b/org.simantics.sysdyn/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Simantics System Dynamics Bundle-SymbolicName: org.simantics.sysdyn;singleton:=true -Bundle-Version: 1.8.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Version: 1.9.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.simantics.objmap;bundle-version="0.1.0", org.simantics.db;bundle-version="0.6.2", org.simantics.modelica;bundle-version="1.0.0", diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java index 53aec601..e4f589ac 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Association for Decentralized Information Management in + * Copyright (c) 2007, 2012, 2015 Association for Decentralized Information Management in * Industry THTH ry. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -155,7 +155,7 @@ public class SysdynGameExperiment extends SysdynGameExperimentBase { if(simulationLocation != null && !canceled) { // Load fmu and initialize it for simulation try { - if (false && !fortranLibrariesLoaded) { // Enable this when we update from OpenModelica 1.9.0beta4! + if (!fortranLibrariesLoaded) { // Enable this when we update from OpenModelica 1.9.0beta4! File omDir = ModelicaManager.getOMHome(); File mingw = new File(omDir, "MinGW"); File mbin = new File(mingw, "bin"); diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/SolverSettings.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/SolverSettings.java index 65ec03b9..a38a3ce4 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/SolverSettings.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/SolverSettings.java @@ -20,7 +20,7 @@ public class SolverSettings { if (type == null) { // solver type is not set, should not happen since the default // value should be in plugin_customization.ini - return SolverType.OPENMODELICA; + return SolverType.INTERNAL; } if (SOLVER_TYPE_INTERNAL.equals(type)) { return SolverType.INTERNAL; -- 2.47.1