diff --git a/windows_deliv/etc/config.btm b/windows_deliv/etc/config.btm index a9b2d82..7de0b82 100644 --- a/windows_deliv/etc/config.btm +++ b/windows_deliv/etc/config.btm @@ -15,7 +15,7 @@ endiff REM General configuration iff not defined STUDIO_VERSION_MAJOR_MINOR then - set STUDIO_VERSION_MAJOR_MINOR=19.01 + set STUDIO_VERSION_MAJOR_MINOR=19.02 endiff iff not defined WORK_DIR then diff --git a/windows_deliv/inc/display_environment.btm b/windows_deliv/inc/display_environment.btm index 1795a38..0422013 100644 --- a/windows_deliv/inc/display_environment.btm +++ b/windows_deliv/inc/display_environment.btm @@ -20,23 +20,23 @@ echo ecb version: ecb -version echo The C environment: ISE_C_COMPILER=%ISE_C_COMPILER% (ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER%) iff defined HAS_C_COMP_VER then - echo - HAS_C_COMP_VER=%HAS_C_COMP_VER% -endiff -iff defined HAS_WSDK71 then - echo - HAS_WSDK71=%HAS_WSDK71% + echo - HAS_C_COMP_VER=%HAS_C_COMP_VER% ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER% (ISE_C_COMPILER=%ISE_C_COMPILER%) endiff +::iff defined HAS_WSDK71 then +:: echo - HAS_WSDK71=%HAS_WSDK71% +::endiff iff defined HAS_VC100 then echo - HAS_VC100=%HAS_VC100% endiff -iff defined HAS_VC110 then - echo - HAS_VC110=%HAS_VC110% -endiff +::iff defined HAS_VC110 then +:: echo - HAS_VC110=%HAS_VC110% +::endiff iff defined HAS_VC140 then echo - HAS_VC140=%HAS_VC140% endiff -iff defined HAS_VC150 then - echo - HAS_VC150=%HAS_VC150% -endiff +::iff defined HAS_VC150 then +:: echo - HAS_VC150=%HAS_VC150% +::endiff echo MYSQL lib location: %MYSQL% echo ----------------------------- diff --git a/windows_deliv/init.btm b/windows_deliv/init.btm index 8754062..b26b178 100644 --- a/windows_deliv/init.btm +++ b/windows_deliv/init.btm @@ -29,13 +29,17 @@ iff not isdir %TMP_EIFFEL_SRC% then 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_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_VC150 VC150 +::call %INIT_DIR\inc\set_has_c_compiler HAS_VC150 VC150 -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 +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% + ) + ) +) +echo HAS_C_COMP_VER=%HAS_C_COMP_VER% diff --git a/windows_deliv/make_delivery.btm b/windows_deliv/make_delivery.btm index bc29f51..d1f15c9 100644 --- a/windows_deliv/make_delivery.btm +++ b/windows_deliv/make_delivery.btm @@ -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 diff --git a/windows_deliv/make_exes.btm b/windows_deliv/make_exes.btm index 84c6743..f1e2a16 100644 --- a/windows_deliv/make_exes.btm +++ b/windows_deliv/make_exes.btm @@ -42,13 +42,18 @@ else safe_copy %EIFFEL_SRC\C\CONFIGS\windows-x86-64-mingw %STUDIO_DIR\studio\config\%ISE_PLATFORM\mingw\config.sh endiff -iff defined HAS_VC140 then +IF "%HAS_VC140%" == "True" ( remtrace Compile the run-time for Microsoft (msc_vc140) espawn -u:VC140 "%COMSPEC% /c %INIT_DIR%\make_runtimes.btm msc_vc140" -endiff - -remtrace Compile the run-time for Microsoft (ISE_C_COMPILER=%ISE_C_COMPILER% ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER%) -espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c %INIT_DIR%\make_runtimes.btm msc" +) +IF "%HAS_VC100%" == "True" ( + remtrace Compile the run-time for Microsoft (msc) + espawn -u:VC100 "%COMSPEC% /c %INIT_DIR%\make_runtimes.btm msc" +) +IF "%HAS_C_COMP_VER%" == "True" ( + remtrace Compile the run-time for Microsoft (ISE_C_COMPILER=%ISE_C_COMPILER% ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER%) + espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c %INIT_DIR%\make_runtimes.btm %ISE_C_COMPILER%" +) remtrace Copy the header files safe_copy %EIFFEL_SRC\C\run-time\*.h %STUDIO_DIR\studio\spec\%ISE_PLATFORM\include