- Revert r15347 (breaks Linux compilation, breaks setModelicaPath() API)

  - If this functionality is needed; do the caching for both Linux and Windows. And make sure setModelicaPath updates the cached path instead of just set the env.var


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15348 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/runtime/Settings_omc.cpp

@@ -53,7 +53,7 @@ extern const char* Settings_getModelicaPath(int runningTestsuite)
   const char *path = SettingsImpl__getModelicaPath(runningTestsuite);
   if (path == NULL)
     MMC_THROW();
-  return strdup(path);
+  return path;
 }
 
 extern const char* Settings_getCompileCommand()

Compiler/runtime/Settings_rml.c

@@ -138,7 +138,8 @@ RML_BEGIN_LABEL(Settings__getModelicaPath)
   if (path == NULL)
     RML_TAILCALLK(rmlFC);
   else
-    rmlA0 = (void*) mk_scon(path);
+    rmlA0 = mk_scon(path);
+  free(path);
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL

Compiler/runtime/settingsimpl.c

@@ -65,9 +65,7 @@ static int   echo = 1; //true
 extern char* _replace(char* source_str,char* search_str,char* replace_str); //Defined in systemimpl.c
 extern int SystemImpl__directoryExists(const char*);
 
-#if defined(__MINGW32__) || defined(_MSC_VER)
 static char* winPath = NULL;
-#endif
 
 // Do not free or modify the returned variable. It's part of the environment!
 const char* SettingsImpl__getInstallationDirectoryPath() {
@@ -95,14 +93,11 @@ const char* SettingsImpl__getInstallationDirectoryPath() {
     i++;
   }
   return (const char*)winPath;
-#else
-  return path;
 #endif
+  return path;
 }
 
-#if defined(__MINGW32__) || defined(_MSC_VER)
-static char* winLibPath = NULL;
-#endif
+char* winLibPath = NULL;
 
 // Do not free the returned variable. It's malloc'ed
 char* SettingsImpl__getModelicaPath(int runningTestsuite) {
@@ -134,17 +129,13 @@ char* SettingsImpl__getModelicaPath(int runningTestsuite) {
   }
 
 #if defined(__MINGW32__) || defined(_MSC_VER)
-  /* already set, set it only once! */
-  if (winLibPath != NULL)
-    return winLibPath;
-
   /* adrpo: translate this to forward slashes! */
   /* duplicate the path */
   winLibPath = strdup(path);
 
   /* ?? not enough memory for duplication */
   if (!winLibPath)
-    return path;
+    return strdup(path);
 
   /* convert \\ to / */
   while(winLibPath[i] != '\0')
@@ -153,9 +144,9 @@ char* SettingsImpl__getModelicaPath(int runningTestsuite) {
     i++;
   }
   return winLibPath;
-#else
-  return path;
 #endif
+
+  return strdup(path);
 }
 
 static const char* SettingsImpl__getCompileCommand()