- Prefer ModelicaServices 1.0 over 1.1 (MSL 3.1 > MSL 3.2)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9090 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 24, 2011 · fd0de59 · fd0de59
1 parent 9736256
commit fd0de59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Compiler/runtime/systemimpl.c b/Compiler/runtime/systemimpl.c
@@ -1470,7 +1470,9 @@ int SystemImpl__getLoadModelPath(const char *name, void *prios, void *mps, const
             /* Search for an appropriate version of the library */
             outPrio = prio;
             prio = getPrio(version,versionLen);
+            /* Force preferred version MSL 3.1 / MS 1.0 */
             if (prio == 0 && 0 == strcmp("Modelica",name) && 0 == strcmp(version,"3.1")) prio = -1;
+            if (prio == 0 && 0 == strcmp("ModelicaServices",name) && 0 == strcmp(version,"1.0")) prio = -1;
             /* TODO: Use something better than strcmp. We need natural sort for all cases... */
             if (prio < defaultPrio || (prio == defaultPrio && strcmp(version, defaultVersion) > 0)) {
               defaultPrio = prio;

diff --git a/Makefile.common b/Makefile.common
@@ -103,9 +103,9 @@ susgen:
 	(cd Compiler/susan_codegen/SimCode/GenTest && time $(MAKE) -f Makefile)
 
 omlibrary:
-	test ! -d ../build/lib/omlibrary && \
-	(cd libraries/ && find . -type d -not -path "*svn*" -exec install -m755 -d ../build/lib/omlibrary/{} \;) && \
-	(cd libraries/ && find . -type f -not -path "*svn*" -exec install -m644 {} ../build/lib/omlibrary/{} \;)
+	test -d ./build/lib/omlibrary || \
+	((cd libraries/ && find . -type d -not -path "*svn*" -exec install -m755 -d ../build/lib/omlibrary/{} \;) && \
+	(cd libraries/ && find . -type f -not -path "*svn*" -exec install -m644 {} ../build/lib/omlibrary/{} \;))
 
 distclean: clean
 	(cd Compiler && $(MAKE) -f $(defaultMakefileTarget) reallyclean)