Simplified and focus on msc, msc_vc140

This commit is contained in:
2019-02-20 14:28:00 +01:00
parent 48be270648
commit 97f0a1d2aa
11 changed files with 145 additions and 108 deletions

View File

@@ -13,6 +13,8 @@ set ISE_SRC=%TMP_EIFFEL_SRC
:: Make sure required directories exist
REM Create parent dir of %INSTALL_LOG if it does not exist.
echo DELIV_DIR=[%DELIV_DIR%]
echo INSTALL_LOG=[%INSTALL_LOG%]
set_parent_dir_of PDIR %INSTALL_LOG%
iff not isdir %PDIR then
md /S %PDIR
@@ -30,16 +32,27 @@ endiff
:: Get C compilation environment information
::call %INIT_DIR\inc\set_has_c_compiler HAS_WSDK71 WSDK71
call %INIT_DIR\inc\set_has_c_compiler HAS_VC100 VC100
call %INIT_DIR\inc\set_has_c_compiler HAS_VC140 VC140
::call %INIT_DIR\inc\set_has_c_compiler HAS_VC100 VC100
::call %INIT_DIR\inc\set_has_c_compiler HAS_VC140 VC140
::call %INIT_DIR\inc\set_has_c_compiler HAS_VC150 VC150
set "HAS_C_COMP_VER=False"
if "%ISE_C_COMPILER_VER%" NEQ "" (
IF /I "%ISE_C_COMPILER_VER%" NEQ "VC100" (
IF /I "%ISE_C_COMPILER_VER%" NEQ "VC140" (
call %INIT_DIR\inc\set_has_c_compiler HAS_C_COMP_VER %ISE_C_COMPILER_VER%
)
)
set "HAS_VC_MSC=False"
if "%ISE_VC_MSC%" NEQ "" (
call %INIT_DIR\inc\set_has_c_compiler HAS_VC_MSC %ISE_VC_MSC%
)
echo HAS_C_COMP_VER=%HAS_C_COMP_VER%
echo HAS_VC_MSC=%HAS_VC_MSC%
set "HAS_VC_MSC_VC140=False"
if "%ISE_VC_MSC_VC140%" NEQ "" (
call %INIT_DIR\inc\set_has_c_compiler HAS_VC_MSC_VC140 %ISE_VC_MSC_VC140%
)
echo HAS_VC_MSC_VC140=%HAS_VC_MSC_VC140%
:: if "%ISE_C_COMPILER_VER%" NEQ "" (
:: IF /I "%ISE_C_COMPILER_VER%" NEQ "VC100" (
:: IF /I "%ISE_C_COMPILER_VER%" NEQ "VC140" (
:: call %INIT_DIR\inc\set_has_c_compiler HAS_C_COMP_VER %ISE_C_COMPILER_VER%
:: )
:: )
:: )
::echo HAS_C_COMP_VER=%HAS_C_COMP_VER%