Changeset 8294 for trunk/make

Timestamp:

Apr 22, 2002, 3:59:34 AM (24 years ago)

Author:

bird

Message:

Support for forced environment change, using BUILD_ENV_FORCE,
BUILD_ENVS_PRE and BUILD_ENVS_POST.
(first successful try)

Location:

trunk/make

Files:

• process.forwarder.mak (added)
• setup.mak (modified) (5 diffs)
• setup.os2debvac308.mk (modified) (1 diff)
• setup.os2debwat11.mk (modified) (1 diff)
• setup.tools.mk (modified) (2 diffs)

trunk/make/setup.mak

@@ -1 @@
-# $Id: setup.mak,v 1.4 2002-04-22 00:28:46 bird Exp $
+# $Id: setup.mak,v 1.5 2002-04-22 01:59:33 bird Exp $
 
 #
@@ -61 +61 @@
 SHT_BLDENV=mscv6
 !endif
-!if "$(BUILD_ENV)" == "WAT11"
-SHT_BLDENV=wat11
-!endif
-!if "$(BUILD_ENV)" == "WATCOM"
+!if "$(BUILD_ENV)" == "WAT11C"
 SHT_BLDENV=wat11
 !endif
@@ -71 +68 @@
 !endif
 
+
+!ifdef BUILD_ENV_FORCE
+SHT_BLDENVFRC=
+!if "$(BUILD_ENV_FORCE)" == "VAC308"
+SHT_BLDENVFRC=vac308
+!endif
+!if "$(BUILD_ENV_FORCE)" == "VAC365"
+SHT_BLDENVFRC=vac365
+!endif
+!if "$(BUILD_ENV_FORCE)" == "VAC4"
+SHT_BLDENVFRC=vac4
+!endif
+!if "$(BUILD_ENV_FORCE)" == "EMX"
+SHT_BLDENVFRC=emx
+!endif
+!if "$(BUILD_ENV_FORCE)" == "MSCV6"
+SHT_BLDENVFRC=mscv6
+!endif
+!if "$(BUILD_ENV_FORCE)" == "WAT11C"
+SHT_BLDENVFRC=wat11
+!endif
+!if "$(SHT_BLDENVFRC)" == ""
+! error Fatal error: Var BUILD_ENV_FORCE is incorrect. ($(BUILD_ENV_FORCE)) Valid values: VAC308, VAC365, VAC4, EMX, MSCV6 and WATCOM
+!endif
+!else
+BUILD_ENV_FORCE=$(BUILD_ENV)
+SHT_BLDENVFRC=$(SHT_BLDENV)
+!endif
 
 
@@ -131 +156 @@
 
 # -----------------------------------------------------------------------------
-# Build the environments
-# -----------------------------------------------------------------------------
-
-# EXPERIMENTAL
-!if 0
-# These strings are passed on to the BuildEnv.cmd script to setup
-# the correct environment.
-BUILD_ENVS_BASE_POST    = toolkit40
-BUILD_ENVS_BASE_PRE     =
-
-# Check for forced change in default compiler environment.
-!ifdef BUILD_ENV_FORCE
-!if "$(BUILD_ENV)" != "$(BUILD_ENV_FORCE)" || "$(BUILD_ENVS_PRE)" != "" || "$(BUILD_ENVS_POST)" != ""
-#
-# Remove old compiler and insert new compiler into the environment.
-# The individual makefiles requests changes using BUILD_ENVS_[PRE|POST].
-#
-!if [echo call $(PATH_TOOLS)\BuildEnv.cmd $(BUILD_ENV)- $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(BUILD_ENV_FORCE) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)]
-!endif
-!if [call $(PATH_TOOLS)\BuildEnv.cmd $(BUILD_ENV)- $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(BUILD_ENV_FORCE) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)]
-!endif
-#BUILD_ENV = $(BUILD_ENV_FORCE)
-!endif
-!endif
-
-!endif
-
-
-
-# -----------------------------------------------------------------------------
 # Include the setup.
 #   First the default common tools setup is included.
@@ -225 +220 @@
 
 
-!endif MAKE_SETUP_INCLUDED
-
+
+# -----------------------------------------------------------------------------
+# Build the environments
+# -----------------------------------------------------------------------------
+
+# In the makefiles you're allowed to use the BUILD_ENVS_PRE,
+# BUILD_ENV_FORCE, BUILD_ENVS_POST variables to make private changes to the
+# environment. These are combined with the two base ones as follows:
+#   $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(ENV_ENVS) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)
+#
+# BUILD_ENV_FORCE is used for changing the base compiler. Do *NOT* use
+# BUILD_ENV for that! BUILD_ENV_FORCE isn't used directly but in the setup
+# string above, but ENV_ENVS from the setup.[w]xyz.mk setup file is used.
+#
+
+# These strings are passed on to the BuildEnv.cmd script to setup the correct
+# shell environment.
+# TODO   Should these be overridable by setup.[w]xyz.mak ? (kso)
+
+BUILD_ENVS_BASE_POST    = toolkit40
+BUILD_ENVS_BASE_PRE     =
+
+
+# Check if there is any change in the environment.
+# If there are we will have to forward all target commands to the
+# correct shell environment
+!if "$(BUILD_ENV)" != "$(BUILD_ENV_FORCE)" || "$(BUILD_ENVS_PRE)" != "" || "$(BUILD_ENVS_POST)" != ""
+MAKE_INCLUDE_PROCESS = $(PATH_MAKE)\process.forwarder.mak
+
+
+# Compiler change or just environment change.
+! if "$(BUILD_ENV)" != "$(BUILD_ENV_FORCE)"
+MAKE_INCLUDE_SETUP_FORCE = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)$(SHT_BLDENVFRC).mk
+!  ifndef BUILD_QUIET
+!   if [$(ECHO) Including forced platform setup file $(CLRFIL)$(MAKE_INCLUDE_SETUP_FORCE)$(CLRRST)]
+!   endif
+!  endif
+!  include $(MAKE_INCLUDE_SETUP_FORCE)
+BUILD_ENVS_CHANGE = $(ENV_ENVS: =- )- $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(ENV_ENVS_FORCE) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)
+! else
+BUILD_ENVS_CHANGE = $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(ENV_ENVS) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)
+! endif
+
+!endif
+
+
+!endif # MAKE_SETUP_INCLUDED
+

trunk/make/setup.os2debvac308.mk

@@ -1 @@
-# $Id: setup.os2debvac308.mk,v 1.4 2002-04-22 00:30:09 bird Exp $
+# $Id: setup.os2debvac308.mk,v 1.5 2002-04-22 01:59:34 bird Exp $
 
 # ---OS2, DEBUG, VAC308-------------------------
 ENV_NAME="OS/2, Debug, IBM VisualAge for C++ 3.08"
 ENV_STATUS=OK
+!if "$(ENV_ENVS)" == ""
+ENV_ENVS=vac308
+!else
+ENV_ENVS_FORCE=vac308
+!endif
+
 
 #

trunk/make/setup.os2debwat11.mk

@@ -1 @@
-# $Id: setup.os2debwat11.mk,v 1.2 2002-04-22 00:30:10 bird Exp $
+# $Id: setup.os2debwat11.mk,v 1.3 2002-04-22 01:59:34 bird Exp $
 
 # ---OS2, DEBUG, VAC308-------------------------
-ENV_NAME="OS/2, Debug, Watcom 11.0, 11.0c, ++"
+ENV_NAME="OS/2, Debug, Watcom 11.0c"
 ENV_STATUS=OK
+!if "$(ENV_ENVS)" == ""
+ENV_ENVS=vac308 watcomc11c
+!else
+ENV_ENVS_FORCE=vac308 watcomc11c
+!endif
 
 #

trunk/make/setup.tools.mk

@@ -1 @@
-# $Id: setup.tools.mk,v 1.5 2002-04-22 00:30:54 bird Exp $
+# $Id: setup.tools.mk,v 1.6 2002-04-22 01:59:34 bird Exp $
 
 
@@ -45 +45 @@
 TOOL_RM         = rm.exe -f
 TOOL_TYPE       = type
+TOOL_BUILDENV   = $(PATH_TOOLS)\BuildEnv.cmd