eiffel/es_build_deliv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned HAS_ ... variables.

Browse Source 
Use DOS syntax when TCC/LE is not required.
This commit is contained in:
jocelyn
2019-02-12 15:37:10 +01:00
parent 2496b498ec
commit 743243bf12
5 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows_deliv/make_delivery.btm
+35 -28
View File
@@ -247,56 +247,63 @@ call make_other_libraries.btm %STUDIO_DIR
:clibs
remtrace Compile C code of Eiffel Software C libraries
call %INIT_DIR\inc\set_has_c_compiler HAS_VC140 VC140
remtrace HAS_VC100=%HAS_VC100%
remtrace HAS_VC140=%HAS_VC140%
remtrace HAS_C_COMP_VER=%HAS_C_COMP_VER% : ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER% (ISE_C_COMPILER=%ISE_C_COMPILER%)
iff defined ISE_C_COMPILER_VER .and. "%ISE_C_COMPILER_VER%" != "VC140" then
call %INIT_DIR\inc\set_has_c_compiler HAS_C_COMP_VER %ISE_C_COMPILER_VER%
else
set "HAS_C_COMP_VER=False"
endiff
remtrace HAS_C_COMP_VER=%HAS_C_COMP_VER%
iff "%HAS_VC140%" == "True" then
IF "%HAS_VC100%" == "True" (
cdd %INIT_DIR
remtrace Build the C libraries of non-Eiffel Software C libraries for msc (VC100)
call espawn -u:VC100 "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc"
)
IF "%HAS_VC140%" == "True" (
cdd %INIT_DIR
remtrace Build the C libraries of non-Eiffel Software C libraries for msc_vc140 (VC140)
call espawn -u:VC140 "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc_vc140"
endiff
iff "%HAS_C_COMP_VER%" == "True" then
remtrace Build the C libraries of non-Eiffel Software C libraries for msc (%ISE_C_COMPILER_VER%)
)
IF "%HAS_C_COMP_VER%" == "True" (
remtrace Build the C libraries of non-Eiffel Software C libraries for %ISE_C_COMPILER (%ISE_C_COMPILER_VER%)
cdd %INIT_DIR
call espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc"
endiff
call espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR %ISE_C_COMPILER%"
)
cdd %INIT_DIR
remtrace Build the C libraries of non-Eiffel Software C libraries for mingw
call compile_c_libraries.btm %STUDIO_DIR mingw
iff "%HAS_VC140%" == "True" then
IF "%HAS_VC100%" == "True" (
cdd %INIT_DIR
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for msc_vc100 (VC100)
call espawn -u:VC100 "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc"
)
IF "%HAS_VC140%" == "True" (
cdd %INIT_DIR
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for msc_vc140 (VC140)
call espawn -u:VC140 "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc_vc140"
endiff
iff "%HAS_C_COMP_VER%" == "True" then
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for msc (%ISE_C_COMPILER_VER%)
)
IF "%HAS_C_COMP_VER%" == "True" (
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for %ISE_C_COMPILER% (%ISE_C_COMPILER_VER%)
cdd %INIT_DIR
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc"
endiff
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental %ISE_C_COMPILER%"
)
cdd %INIT_DIR
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for mingw
call compile_c_libraries.btm %STUDIO_DIR\experimental mingw
iff "%HAS_VC140%" == "True" then
IF "%HAS_VC100%" == "True" (
remtrace Build the other C libraries of non-Eiffel Software C libraries for msc (VC100)
cdd %INIT_DIR
espawn -u:VC100 "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc"
)
IF "%HAS_VC140%" == "True" (
remtrace Build the other C libraries of non-Eiffel Software C libraries for msc_vc140 (VC140)
cdd %INIT_DIR
espawn -u:VC140 "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc_vc140"
endiff
iff "%HAS_C_COMP_VER%" == "True" then
remtrace Build the other C libraries of non-Eiffel Software C libraries for msc (%ISE_C_COMPILER_VER%)
)
IF "%HAS_C_COMP_VER%" == "True" (
remtrace Build the other C libraries of non-Eiffel Software C libraries for %ISE_C_COMPILER% (%ISE_C_COMPILER_VER%)
cdd %INIT_DIR
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc"
endiff
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR %ISE_C_COMPILER%"
)
remtrace Build the other C libraries of non-Eiffel Software C libraries for mingw
cdd %INIT_DIR
call compile_other_c_libraries.btm %STUDIO_DIR mingw