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

more information, and better split gpl vs ent

Browse Source
This commit is contained in:
Jocelyn FIAT
2019-02-12 11:52:33 +01:00
parent ed687c02c7
commit 3125ceb7fa
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

12
windows_deliv/make_delivery.btm
View File

@@ -260,11 +260,11 @@ remtrace HAS_C_COMP_VER=%HAS_C_COMP_VER%
iff "%HAS_VC140%" == "True" then iff "%HAS_VC140%" == "True" then
cdd %INIT_DIR 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" call espawn -u:VC140 "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc_vc140"
endiff endiff
iff "%HAS_C_COMP_VER%" == "True" then 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 cdd %INIT_DIR
call espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc" call espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR msc"
endiff endiff
@@ -274,12 +274,12 @@ call compile_c_libraries.btm %STUDIO_DIR mingw
iff "%HAS_VC140%" == "True" then iff "%HAS_VC140%" == "True" then
cdd %INIT_DIR 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" call espawn -u:VC140 "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc_vc140"
endiff endiff
iff "%HAS_C_COMP_VER%" == "True" then 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 cdd %INIT_DIR
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc" espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_c_libraries.btm %STUDIO_DIR\experimental msc"
endiff 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 call compile_c_libraries.btm %STUDIO_DIR\experimental mingw
iff "%HAS_VC140%" == "True" then 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 cdd %INIT_DIR
espawn -u:VC140 "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc_vc140" espawn -u:VC140 "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc_vc140"
endiff endiff
iff "%HAS_C_COMP_VER%" == "True" then 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 cdd %INIT_DIR
espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc" espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c compile_other_c_libraries.btm %STUDIO_DIR msc"
endiff endiff

38
windows_deliv/make_installations.btm
View File

@@ -55,25 +55,27 @@ iff .%1.==.. then
remtrace Recompile Custom actions for installation program remtrace Recompile Custom actions for installation program
remtrace -------------------------------------------------- remtrace --------------------------------------------------
cdd %EIFFEL_SRC iff not defined NO_ENTERPRISE_BUILD then
cd tools cdd %EIFFEL_SRC
if EXIST %INIT_DIR%\isesvn\tools\setup ( cd tools
xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I if EXIST %INIT_DIR%\isesvn\tools\setup (
) else ( xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I
co %DEFAULT_ISE_SVN%/Src/tools/setup setup ) else (
) co %DEFAULT_ISE_SVN%/Src/tools/setup setup
cd %EIFFEL_SRC\tools\setup\studio )
clean_project cd %EIFFEL_SRC\tools\setup\studio
finalize setup.ecf clean_project
cleanup_eiffel setup setup.dll finalize setup.ecf
iff not exist setup.dll then cleanup_eiffel setup setup.dll
remtrace Couldnt generate setup.dll iff not exist setup.dll then
QUIT remtrace Couldnt generate setup.dll
CANCEL_ON_ERROR QUIT
CANCEL_ON_ERROR
endiff
safe_md %INIT_DIR\install\binaries
safe_md %INIT_DIR\install\binaries\%WINNAME
move setup.dll %INIT_DIR\install\binaries\%WINNAME
endiff endiff
safe_md %INIT_DIR\install\binaries
safe_md %INIT_DIR\install\binaries\%WINNAME
move setup.dll %INIT_DIR\install\binaries\%WINNAME
endiff endiff
remtrace ---------------------------------------------- remtrace ----------------------------------------------