more information, and better split gpl vs ent

This commit is contained in:
2019-02-12 11:52:33 +01:00
parent ed687c02c7
commit 3125ceb7fa
3 changed files with 27 additions and 24 deletions

1
.gitignore vendored
View File

@@ -7,4 +7,5 @@ windows_deliv/install/bin/
windows_deliv/install/binaries/
windows_deliv/install/wix
windows_deliv/wix
windows_deliv/bin
repos/mirrors/svn/*/

View File

@@ -260,11 +260,11 @@ remtrace HAS_C_COMP_VER=%HAS_C_COMP_VER%
iff "%HAS_VC140%" == "True" then
cdd %INIT_DIR
remtrace Build the C libraries of non-Eiffel Software C libraries for msc_vc140
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 %ISE_C_COMPILER_VER%
remtrace Build the C libraries of non-Eiffel Software C libraries for msc (%ISE_C_COMPILER_VER%)
cdd %INIT_DIR
call espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc"
endiff
@@ -274,12 +274,12 @@ call compile_c_libraries.btm %STUDIO_DIR mingw
iff "%HAS_VC140%" == "True" then
cdd %INIT_DIR
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for msc_vc140
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 %ISE_C_COMPILER_VER%
remtrace Build the Experimental C libraries of non-Eiffel Software C libraries for msc (%ISE_C_COMPILER_VER%)
cdd %INIT_DIR
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc"
endiff
@@ -288,12 +288,12 @@ remtrace Build the Experimental C libraries of non-Eiffel Software C libraries f
call compile_c_libraries.btm %STUDIO_DIR\experimental mingw
iff "%HAS_VC140%" == "True" then
remtrace Build the other C libraries of non-Eiffel Software C libraries for msc_vc140
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 %ISE_C_COMPILER_VER%
remtrace Build the other C libraries of non-Eiffel Software C libraries for msc (%ISE_C_COMPILER_VER%)
cdd %INIT_DIR
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc"
endiff

View File

@@ -55,6 +55,7 @@ iff .%1.==.. then
remtrace Recompile Custom actions for installation program
remtrace --------------------------------------------------
iff not defined NO_ENTERPRISE_BUILD then
cdd %EIFFEL_SRC
cd tools
if EXIST %INIT_DIR%\isesvn\tools\setup (
@@ -74,6 +75,7 @@ iff .%1.==.. then
safe_md %INIT_DIR\install\binaries
safe_md %INIT_DIR\install\binaries\%WINNAME
move setup.dll %INIT_DIR\install\binaries\%WINNAME
endiff
endiff
remtrace ----------------------------------------------