Changeset 3611c13 in OpenModelica

Timestamp:

2022-09-19T11:40:59+02:00 (19 months ago)

Author:

GitHub <noreply@…>

Children:

b296c03

Parents:

b309373

git-author:

scrouthtv <lennivh24@…> (09/19/22 11:40:59)

git-committer:

GitHub <noreply@…> (09/19/22 11:40:59)

Message:

Remove unnecessary call() and path changing

• Set %PATH% directly by variable expansion
• No need to store the current directory anymore
• Quit directly with %RESULT% without first opening a child shell

File:

• OMCompiler/Compiler/scripts/Compile.bat (modified) (3 diffs)

OMCompiler/Compiler/scripts/Compile.bat

@@ -18 +18 @@
 set LIBRARY_PATH=
 set OLD_PATH=%PATH%
-call :CONVERT_OPENMODELICAHOME_TO_SHORT_PATH_NAME "%OPENMODELICAHOME%"
 set "MINGW=%OPENMODELICAHOME%tools\msys\%OM_PLATFORM%"
 set ADDITIONAL_ARGS=
@@ -26 +25 @@
 REM echo OPENMODELICAHOME = %OPENMODELICAHOME% >> %1.log 2>&1
 REM echo MINGW = %MINGW% >>%1.log 2>&1
-call :CONVERT_CD_TO_SHORT_PATH_NAME "%CD%"
 
-if %LOGGING%==1 (goto :SET_PATH_LOG) else (goto :SET_PATH)
-
-:SET_PATH_LOG
-cd /D "%MINGW%\bin" >>%CURRENT_DIR%\%1.log 2>&1
-set PATH=%CD%;%CD%\..\..\usr\bin; >>%CURRENT_DIR%\%1.log 2>&1
-cd /D "%CURRENT_DIR%" >>%CURRENT_DIR%\%1.log 2>&1
-goto :CHECK_TARGET
-
-:SET_PATH
-cd /D "%MINGW%\bin"
-set PATH=%CD%;%CD%\..\..\usr\bin;
+% PATH for mingw binary lookup
+set "PATH=%MINGW%\bin;%MINGW%\..\usr\bin;"
 echo PATH = "%PATH%"
-cd /D "%CURRENT_DIR%"
-goto :CHECK_TARGET
 
 REM echo PATH = %PATH% >>%1.log 2>&1
 REM echo CD = %CD% >>%1.log 2>&1
 
-:CHECK_TARGET
 if /I "%2"=="msvc" (goto :MSVC)
 if /I "%2"=="msvc10" (goto :MSVC100)
@@ -116 +102 @@
 
 :Final
-set PATH=%OLD_PATH%
+set "PATH=%OLD_PATH%"
 set OLD_PATH=
-@%COMSPEC% /C exit %RESULT%
-EXIT /B %ERRORLEVEL%
-
-:CONVERT_CD_TO_SHORT_PATH_NAME
-set CURRENT_DIR="%~s1"
-EXIT /B 0
-
-:CONVERT_OPENMODELICAHOME_TO_SHORT_PATH_NAME
-set OPENMODELICAHOME=%~s1
-EXIT /B 0
+EXIT /B %RESULT%