Skip to content

Commit

Permalink
Added some additional arguments to compile.bat so OMEdit can use it.
Browse files Browse the repository at this point in the history
  • Loading branch information
adeas31 authored and OpenModelica-Hudson committed Dec 2, 2015
1 parent 063ca3e commit fee3aec
Showing 1 changed file with 32 additions and 22 deletions.
54 changes: 32 additions & 22 deletions Compiler/scripts/Compile.bat
@@ -1,4 +1,12 @@
@echo off
REM Arguments
REM 1 fileprefix
REM 2 target
REM 3 serial/parallel
REM 4 number of processors
REM 5 LOGGING 0/1
if not "%4"=="" (set NUM_PROCS=%4) else (set NUM_PROCS=%NUMBER_OF_PROCESSORS%)
if not "%5"=="" (set LOGGING=%5) else (set LOGGING=1)
REM Clear all environment variables that may interfere during compile and link phases.
set GCC_EXEC_PREFIX=
set CPLUS_INCLUDE_PATH=
Expand All @@ -13,11 +21,26 @@ if not %OMDEV%a==a set MINGW=%OMDEV%\tools\MinGW
REM echo OPENMODELICAHOME = %OPENMODELICAHOME% >> %1.log 2>&1
REM echo MINGW = %MINGW% >>%1.log 2>&1
set CURRENT_DIR="%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%\..\libexec\gcc\mingw32\4.4.0\; >>%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%\..\libexec\gcc\mingw32\4.4.0\;
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)
if /I "%2"=="msvc12" (goto :MSVC110)
Expand All @@ -33,72 +56,59 @@ if defined VS110COMNTOOLS (goto :MSVC110)
if not defined VS100COMNTOOLS (goto :MINGW)
goto :MSVC100



:MSVC100
REM "Use Visual Studio 2010"
set MSVCHOME=%VS100COMNTOOLS%..\..\VC
if not exist "%MSVCHOME%\vcvarsall.bat" (goto :MINGW)
set PATHTMP=%PATH%
set PATH=%OLD_PATH%
call "%MSVCHOME%\vcvarsall.bat" >> %1.log 2>&1
if %LOGGING%==1 (call "%MSVCHOME%\vcvarsall.bat" >> %1.log 2>&1) else (call "%MSVCHOME%\vcvarsall.bat")
goto :MSVCCOMPILE



:MSVC110
REM "Use Visual Studio 2012"
set MSVCHOME=%VS110COMNTOOLS%..\..\VC
if not exist "%MSVCHOME%\vcvarsall.bat" (goto :MINGW)
set PATHTMP=%PATH%
set PATH=%OLD_PATH%
call "%MSVCHOME%\vcvarsall.bat" >> %1.log 2>&1
if %LOGGING%==1 (call "%MSVCHOME%\vcvarsall.bat" >> %1.log 2>&1) else (call "%MSVCHOME%\vcvarsall.bat")
goto :MSVCCOMPILE



:MSVC120
REM "Use Visual Studio 2013"
echo "msvc120"
set MSVCHOME=%VS120COMNTOOLS%..\..\VC
if not exist "%MSVCHOME%\vcvarsall.bat" (goto :MINGW)
set PATHTMP=%PATH%
set PATH=%OLD_PATH%
call "%MSVCHOME%\vcvarsall.bat" >> %1.log 2>&1
if %LOGGING%==1 (call "%MSVCHOME%\vcvarsall.bat" >> %1.log 2>&1) else (call "%MSVCHOME%\vcvarsall.bat")
goto :MSVCCOMPILE



:MSVC140
REM "Use Visual Studio 2015"
set MSVCHOME=%VS140COMNTOOLS%..\..\VC
if not exist "%MSVCHOME%\vcvarsall.bat" (goto :MINGW)
set PATHTMP=%PATH%
set PATH=%OLD_PATH%
call "%MSVCHOME%\vcvarsall.bat" >> %1.log 2>&1
if %LOGGING%==1 (call "%MSVCHOME%\vcvarsall.bat" >> %1.log 2>&1) else (call "%MSVCHOME%\vcvarsall.bat")
goto :MSVCCOMPILE




:MSVCCOMPILE
set MAKE=
set MAKEFLAGS=
nmake /a /f %1.makefile >> %1.log 2>&1
if %LOGGING%==1 (nmake /a /f %1.makefile >> %1.log 2>&1) else (nmake /a /f %1.makefile)
set RESULT=%ERRORLEVEL%
echo RESULT: %RESULT% >> %1.log 2>&1
if %LOGGING%==1 echo RESULT: %RESULT% >> %1.log 2>&1
goto :Final


:MINGW
REM echo "MINGW"
if "%3"=="parallel" set ADDITIONAL_ARGS=-j%NUMBER_OF_PROCESSORS%
%MinGW%\bin\mingw32-make -f %1.makefile %ADDITIONAL_ARGS% >> %1.log 2>&1
if "%3"=="parallel" set ADDITIONAL_ARGS=-j%NUM_PROCS%
if %LOGGING%==1 (%MinGW%\bin\mingw32-make -f %1.makefile %ADDITIONAL_ARGS% >> %1.log 2>&1) else (%MinGW%\bin\mingw32-make -f %1.makefile %ADDITIONAL_ARGS%)
set RESULT=%ERRORLEVEL%
echo RESULT: %RESULT% >> %1.log 2>&1
if %LOGGING%==1 echo RESULT: %RESULT% >> %1.log 2>&1
goto :Final


:Final
set PATH=%OLD_PATH%
set OLD_PATH=
Expand Down

0 comments on commit fee3aec

Please sign in to comment.