Handle the spaces in installation path and working directory

Author: adeas31

OMCompiler/Compiler/Script/CevalScriptBackend.mo

@@ -3603,7 +3603,7 @@ algorithm
                nozip;
         if 0 <> System.systemCall(cmd, outFile=logfile) then
           Error.addMessage(Error.SIMULATOR_BUILD_ERROR, {System.readFile(logfile)});
-          System.removeFile(dir + logfile);
+          System.removeFile(logfile);
           fail();
         end if;
       then true;
@@ -3655,7 +3655,7 @@ algorithm
                nozip + dquote;
         if 0 <> System.systemCall(cmd, outFile=logfile) then
           Error.addMessage(Error.SIMULATOR_BUILD_ERROR, {cmd + ":\n" + System.readFile(logfile)});
-          System.removeFile(dir + logfile);
+          System.removeFile(logfile);
           // Cleanup
           System.systemCall("docker rm " + containerID);
           System.systemCall("docker volume rm " + volumeID);
@@ -3686,7 +3686,7 @@ algorithm
     end if;
     if 0 <> System.systemCall("cd \"" +  fmutmp + "/sources\" && " + nozip, outFile=logfile) then
       Error.addMessage(Error.SIMULATOR_BUILD_ERROR, {System.readFile(logfile)});
-      System.removeFile(dir + logfile);
+      System.removeFile(logfile);
       fail();
     end if;
   end if;
@@ -3706,7 +3706,7 @@ protected function buildModelFMU " author: Frenkel TUD
   output Values.Value outValue;
 protected
   Boolean staticSourceCodeFMU, success;
-  String filenameprefix, fmutmp, logfile, dir, cmd;
+  String filenameprefix, fmutmp, logfile, configureLogFile, dir, cmd;
   String fmuTargetName;
   GlobalScript.SimulationOptions defaulSimOpt;
   SimCode.SimulationSettings simSettings;
@@ -3786,7 +3786,11 @@ algorithm
   end if;
 
   for platform in platforms loop
-    configureFMU(platform, fmutmp, System.realpath(fmutmp)+"/resources/"+System.stringReplace(listGet(Util.stringSplitAtChar(platform," "),1),"/","-")+".log", isWindows);
+    configureLogFile := System.realpath(fmutmp)+"/resources/"+System.stringReplace(listGet(Util.stringSplitAtChar(platform," "),1),"/","-")+".log";
+    if isWindows then
+      configureLogFile := "\""+configureLogFile+"\"";
+    end if;
+    configureFMU(platform, fmutmp, configureLogFile, isWindows);
     ExecStat.execStat("buildModelFMU: Generate platform " + platform);
   end for;
 

OMCompiler/Compiler/Template/CodegenCpp.tpl

@@ -1523,7 +1523,7 @@ template simulationMainRunScript(SimCode simCode ,Text& extraFuncs,Text& extraFu
     let moLib     =  makefileParams.compileDir
     let home      = makefileParams.omhome
     let outputformat = settings.outputFormat
-    let execParameters = '-S <%start%> -E <%end%> -H <%stepsize%> -G <%intervals%> -P <%outputformat%> -T <%tol%> -I <%solver%> -R "<%simulationLibDir(simulationCodeTarget(),simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace)%>" -M <%moLib%> -r <%simulationResults(Testsuite.isRunning(),simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace)%>'
+    let execParameters = '-S <%start%> -E <%end%> -H <%stepsize%> -G <%intervals%> -P <%outputformat%> -T <%tol%> -I <%solver%> -R "<%simulationLibDir(simulationCodeTarget(),simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace)%>" -M "<%moLib%>" -r "<%simulationResults(Testsuite.isRunning(),simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace)%>"'
     let outputParameter = if (stringEq(settings.outputFormat, "empty")) then "-O none" else ""
     let fileNamePrefixx = fileNamePrefix
 
@@ -1545,7 +1545,7 @@ template simulationMainRunScript(SimCode simCode ,Text& extraFuncs,Text& extraFu
         <%preRunCommandWindows%>
         REM ::export PATH=<%libFolder%>:$PATH REPLACE C: with /C/
         SET PATH=<%home%>/bin;<%libFolder%>;<%libPaths%>;%PATH%
-        <%moLib%>/<%fileNamePrefixx%>.exe <%execParameters%> <%zermMQParams%> <%outputParameter%>
+        "<%moLib%>/<%fileNamePrefixx%>.exe" <%execParameters%> <%zermMQParams%> <%outputParameter%>
         >>
     end match
   end match
@@ -3104,8 +3104,9 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   CXX=cl
   EXEEXT=.exe
   DLLEXT=.dll
-  include $(OMHOME)/include/omc/cpp/ModelicaConfig_msvc.inc
-  include $(OMHOME)/include/omc/cpp/ModelicaLibraryConfig_msvc.inc
+  <% /* Don't use $(OMHOME) with include. NMAKE fails to evaluate it. */ %>
+  include "<%makefileParams.omhome%>/include/omc/cpp/ModelicaConfig_msvc.inc"
+  include "<%makefileParams.omhome%>/include/omc/cpp/ModelicaLibraryConfig_msvc.inc
   # /Od - Optimization disabled
   # /EHa enable C++ EH (w/ SEH exceptions)
   # /fp:except - consider floating-point exceptions when generating code

OMCompiler/Compiler/Template/CodegenFMUCpp.tpl

@@ -686,8 +686,9 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   # run with nmake from Visual Studio Command Prompt
   # FMU packaging requires PATH to $(OMHOME)/mingw/bin
   OMHOME=<%if boolOr(stringEq(makefileParams.platform, "win32"),stringEq(makefileParams.platform, "win64")) then '$(OPENMODELICAHOME)' else makefileParams.omhome%>
-  include $(OMHOME)/include/omc/cpp/ModelicaConfig_msvc.inc
-  include $(OMHOME)/include/omc/cpp/ModelicaLibraryConfig_msvc.inc
+  <% /* Don't use $(OMHOME) with include. NMAKE fails to evaluate it. */ %>
+  include "<%makefileParams.omhome%>/include/omc/cpp/ModelicaConfig_msvc.inc"
+  include "<%makefileParams.omhome%>/include/omc/cpp/ModelicaLibraryConfig_msvc.inc
   # Simulations use /Od by default
   SIM_OR_DYNLOAD_OPT_LEVEL=
   MODELICAUSERCFLAGS=

OMCompiler/Compiler/scripts/Compile.bat

@@ -119,7 +119,7 @@ set OLD_PATH=
 EXIT /B %ERRORLEVEL%
 
 :CONVERT_CD_TO_SHORT_PATH_NAME
-set CURRENT_DIR=%~s1
+set CURRENT_DIR="%~s1"
 EXIT /B 0
 
 :CONVERT_OPENMODELICAHOME_TO_SHORT_PATH_NAME