Skip to content

Commit

Permalink
bug #1159
Browse files Browse the repository at this point in the history
- do not use /B in Compile*.bat as Windows XP will crap out
- delete .log .exe .dll when compiling.


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10048 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Oct 7, 2011
1 parent fd1d479 commit 37722d6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
7 changes: 2 additions & 5 deletions Compiler/Script/CevalScript.mo
Expand Up @@ -2562,17 +2562,14 @@ algorithm
// remove .exe .dll .log!
fileEXE = fileprefix +& System.getExeExt();
fileDLL = fileprefix +& System.getDllExt();
fileLOG = Debug.bcallret2(isWindows,stringAppend,fileprefix,".log",fileprefix);
fileLOG = fileprefix +& ".log";
0 = Debug.bcallret1(System.regularFileExists(fileEXE),System.removeFile,fileEXE,0);
0 = Debug.bcallret1(System.regularFileExists(fileDLL),System.removeFile,fileDLL,0);
0 = Debug.bcallret1(System.regularFileExists(fileLOG),System.removeFile,fileLOG,0);

// call the system command to compile the model!
0 = System.systemCall(s_call);

// one of the dll or exe should be available!
true = Debug.bcallret1(isWindows,System.regularFileExists,fileEXE,true) or
Debug.bcallret1(isWindows,System.regularFileExists,fileDLL,true);

Debug.fprintln("dynload", "compileModel: successful! ");
then
();
Expand Down
2 changes: 1 addition & 1 deletion Compiler/scripts/Compile.bat
Expand Up @@ -16,4 +16,4 @@ popd
set RESULT=%ERRORLEVEL%
set PATH=%OLD_PATH%
set OLD_PATH=
exit /B %RESULT%
exit %RESULT%
2 changes: 1 addition & 1 deletion Compiler/scripts/CompileMSVC.bat
@@ -1,4 +1,4 @@
@echo off
cmd /c "%VS90COMNTOOLS%vsvars32.bat && nmake -f %1.msvc.makefile >%1.log 2<&1"
set RESULT=%ERRORLEVEL%
exit /B %RESULT%
exit %RESULT%

0 comments on commit 37722d6

Please sign in to comment.