From 3125ceb7fa79b9e6c5060c680e156db3334dd7ee Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Tue, 12 Feb 2019 11:52:33 +0100
Subject: [PATCH] more information, and better split gpl vs ent

---
 .gitignore                           |  1 +
 windows_deliv/make_delivery.btm      | 12 ++++-----
 windows_deliv/make_installations.btm | 38 +++++++++++++++-------------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1e1dcbd..9ad43e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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/*/
diff --git a/windows_deliv/make_delivery.btm b/windows_deliv/make_delivery.btm
index ed2f0ec..bc29f51 100644
--- a/windows_deliv/make_delivery.btm
+++ b/windows_deliv/make_delivery.btm
@@ -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
diff --git a/windows_deliv/make_installations.btm b/windows_deliv/make_installations.btm
index ba945b8..259d0bd 100644
--- a/windows_deliv/make_installations.btm
+++ b/windows_deliv/make_installations.btm
@@ -55,25 +55,27 @@ iff .%1.==.. then
 	remtrace Recompile Custom actions for installation program
 	remtrace --------------------------------------------------
 
-	cdd %EIFFEL_SRC
-	cd tools
-	if EXIST %INIT_DIR%\isesvn\tools\setup (
-		xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I
-	) else (
-		co %DEFAULT_ISE_SVN%/Src/tools/setup setup
-	)
-	cd %EIFFEL_SRC\tools\setup\studio
-	clean_project
-	finalize setup.ecf
-	cleanup_eiffel setup setup.dll
-	iff not exist setup.dll then
-		remtrace Couldnt generate setup.dll
-		QUIT
-		CANCEL_ON_ERROR
+	iff not defined NO_ENTERPRISE_BUILD then
+		cdd %EIFFEL_SRC
+		cd tools
+		if EXIST %INIT_DIR%\isesvn\tools\setup (
+			xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I
+		) else (
+			co %DEFAULT_ISE_SVN%/Src/tools/setup setup
+		)
+		cd %EIFFEL_SRC\tools\setup\studio
+		clean_project
+		finalize setup.ecf
+		cleanup_eiffel setup setup.dll
+		iff not exist setup.dll then
+			remtrace Couldnt generate setup.dll
+			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
-	safe_md %INIT_DIR\install\binaries
-	safe_md %INIT_DIR\install\binaries\%WINNAME
-	move setup.dll %INIT_DIR\install\binaries\%WINNAME
 endiff
 
 remtrace ----------------------------------------------