implemented builtin command mkdir() to avoid trouble using system("mk…

…dir -p dir") git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17161 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 10, 2013 · 2fa4b4d · 2fa4b4d
1 parent 4988564
commit 2fa4b4d
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 4 deletions.
diff --git a/Compiler/FrontEnd/ModelicaBuiltin.mo b/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -885,7 +885,7 @@ type FileType = enumeration(NoFile, RegularFile, Directory, SpecialFile);
 function stat
   input String name;
   output FileType fileType;
-external "C" fileType=ModelicaInternal_stat(name) annotation(Library="ModelicaExternalC");
+external "C" fileType = ModelicaInternal_stat(name) annotation(Library="ModelicaExternalC");
 end stat;
 
 end Internal;
@@ -1622,6 +1622,14 @@ external "builtin";
 annotation(preferredView="text");
 end cd;
 
+function mkdir "create directory of given path (which may be either relative or absolute)
+  returns true if directory was created or already exists."
+  input String newDirectory;
+  output Boolean success;
+external "builtin";
+annotation(preferredView="text");
+end mkdir;
+
 function checkModel "Checks a model and returns number of variables and equations."
   input TypeName className;
   output String result;
@@ -3903,11 +3911,11 @@ div.system-message p.system-message-title { font-weight: bold; }
 <div id=\"wikipage\">
 <div style=\"float: right; margin: 0 1em\" class=\"wikipage\">
 <blockquote>
-<p>← <a class=\"wiki\" href=
+<p>&larr; <a class=\"wiki\" href=
 \"https://trac.openmodelica.org/OpenModelica/wiki/ReleaseNotes/1.8.1\">
 1.8.1</a> | <a class=\"missing wiki\" href=
 \"https://trac.openmodelica.org/OpenModelica/wiki/ReleaseNotes/Future\"
-rel=\"nofollow\">Future?</a> →</p>
+rel=\"nofollow\">Future?</a> &rarr;</p>
 </blockquote>
 </div>
 <div style=

diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo
@@ -1711,6 +1711,18 @@ algorithm
       then
         (cache,Values.STRING(res),st);
 
+    case (cache,env,"mkdir",{Values.STRING(str)},st,_)
+      equation
+        true = System.directoryExists(str);
+      then
+        (cache,Values.BOOL(true),st);
+
+    case (cache,env,"mkdir",{Values.STRING(str)},st,_)
+      equation
+        b = System.createDirectory(str);
+      then
+        (cache,Values.BOOL(b),st);
+
     case (cache,env,"getVersion",{Values.CODE(Absyn.C_TYPENAME(Absyn.IDENT("OpenModelica")))},st,_)
       equation
         str_1 = Settings.getVersionNr();

diff --git a/Compiler/Util/System.mo b/Compiler/Util/System.mo
@@ -328,6 +328,12 @@ public function cd
   external "C" outInteger=chdir(inString) annotation(Library = "omcruntime");
 end cd;
 
+public function createDirectory
+  input String inString;
+  output Boolean outBool;
+  external "C" outBool=SystemImpl__createDirectory(inString) annotation(Library = "omcruntime");
+end createDirectory;
+
 public function pwd
   output String outString;
   external "C" outString=SystemImpl__pwd() annotation(Library = "omcruntime");

diff --git a/Compiler/runtime/System_rml.c b/Compiler/runtime/System_rml.c
@@ -1863,6 +1863,14 @@ RML_BEGIN_LABEL(System__directoryExists)
 }
 RML_END_LABEL
 
+RML_BEGIN_LABEL(System__createDirectory)
+{
+  const char* str = RML_STRINGDATA(rmlA0);
+  rmlA0 = (void*) mk_icon(SystemImpl__createDirectory(str));
+  RML_TAILCALLK(rmlSC);
+}
+RML_END_LABEL
+
 RML_BEGIN_LABEL(System__userIsRoot)
 {
   rmlA0 = mk_icon(CONFIG_USER_IS_ROOT);
@@ -2205,7 +2213,7 @@ RML_END_LABEL
 
 RML_BEGIN_LABEL(System__forkCall)
 {
-  c_add_message(-1,ErrorType_scripting,ErrorLevel_error,gettext("Fork is not available when OpenModelica is compiled using RML"),NULL,0);  
+  c_add_message(-1,ErrorType_scripting,ErrorLevel_error,gettext("Fork is not available when OpenModelica is compiled using RML"),NULL,0);
   RML_TAILCALLK(rmlFC);
 }
 RML_END_LABEL

diff --git a/Compiler/runtime/systemimpl.c b/Compiler/runtime/systemimpl.c
@@ -717,6 +717,25 @@ extern int SystemImpl__directoryExists(const char *str)
 #endif
 }
 
+extern int SystemImpl__createDirectory(const char *str)
+{
+  int rv;
+
+#if defined(__MINGW32__) || defined(_MSC_VER)
+  rv = mkdir(str);
+#else
+  rv = mkdir(str, S_IRWXU);
+#endif
+  if (rv == -1)
+  {
+    return 0;
+  }
+  else
+  {
+    return 1;
+  }
+}
+
 char* SystemImpl__readFileNoNumeric(const char* filename)
 {
   char* buf, *bufRes;