Changeset 9150 for trunk/make

Timestamp:

Aug 28, 2002, 5:47:09 AM (23 years ago)

Author:

bird

Message:

Commented out the environment setup assertions. Moved the forwarding check up. Assert that MAKE_SETUP_INCLUDED isn't defined.

File:

• trunk/make/setup.mak (modified) (7 diffs)

trunk/make/setup.mak

@@ -1 @@
-# $Id: setup.mak,v 1.14 2002-08-25 04:23:39 bird Exp $
+# $Id: setup.mak,v 1.15 2002-08-28 03:47:09 bird Exp $
 
 #
@@ -10 +10 @@
 
 
-!ifndef MAKE_SETUP_INCLUDED
-MAKE_SETUP_INCLUDED=YES
+# -----------------------------------------------------------------------------
+# Assert that the file isn't included several times.
+# -----------------------------------------------------------------------------
+!ifdef MAKE_SETUP_INCLUDED
+! error Fatal error: You've included setup.mak before!!!
+!endif
+MAKE_SETUP_INCLUDED = YES
 
 
@@ -202 +207 @@
 
 
+# -----------------------------------------------------------------------------
+# Set forwarding flag.
+#   If    there is any change in the environment
+#      OR the environment is uncertain (_BUILD_PROJECT not right) Then
+#   Forward all target commands to the new shell environment we setup.
+#
+#   (This have to be done early so the CC setup and it's like can check for
+#   the flag. The rest of the forward stuff is at the bottom.)
+# -----------------------------------------------------------------------------
+!if "$(_BUILD_PROJECT)" != "$(BUILD_PROJECT)" || "$(BUILD_ENV)" != "$(BUILD_ENV_FORCE)" || "$(BUILD_ENVS_PRE)" != "" || "$(BUILD_ENVS_POST)" != ""
+BUILD_FORWARDING = 1
+!else
+BUILD_FORWARDING = 0
+!endif
+
 
 # -----------------------------------------------------------------------------
@@ -225 +245 @@
 # -----------------------------------------------------------------------------
 # Verify the environment setups.
-# -----------------------------------------------------------------------------
-
-!ifndef ENV_NAME
-!error No environment signature has been defined ($(NAME_COMPLETE))
-!endif
-
-!ifndef MAKE_INCLUDE_SETUP
-!error No setup to include has been determined (MAKE_INCLUDE_SETUP)
-!endif
-
-!if "$(ENV_STATUS)" != "OK"
-!error Environment $(ENV_NAME) does work yet (ENV_STATUS is not OK).
-!endif
-
-!ifndef CC
-!error Environment $(ENV_NAME) does not define variable (CC).
-!endif
-
-!ifndef CC_FLAGS_EXE
-!error Environment $(ENV_NAME) does not define variable (CC_FLAGS_EXE).
-!endif
-
-!ifndef LINK
-!error Environment $(ENV_NAME) does not define variable (LINK).
-!endif
-
-!ifndef LINK_FLAGS_EXE
-!error Environment $(ENV_NAME) does not define variable (LINK_FLAGS_EXE).
-!endif
-
+#   Uncomment this when configuring a new project.
+#   When the setup is stable comment it out. (it's a waste of time!)
+# -----------------------------------------------------------------------------
+
+#
+#!ifndef ENV_NAME
+#!error No environment signature has been defined ($(NAME_COMPLETE))
+#!endif
+#
+#!ifndef MAKE_INCLUDE_SETUP
+#!error No setup to include has been determined (MAKE_INCLUDE_SETUP)
+#!endif
+#
+#!if "$(ENV_STATUS)" != "OK"
+#!error Environment $(ENV_NAME) does work yet (ENV_STATUS is not OK).
+#!endif
+#
+#!ifndef CC
+#!error Environment $(ENV_NAME) does not define variable (CC).
+#!endif
+#
+#!ifndef CC_FLAGS_EXE
+#!error Environment $(ENV_NAME) does not define variable (CC_FLAGS_EXE).
+#!endif
+#
+#!ifndef LINK
+#!error Environment $(ENV_NAME) does not define variable (LINK).
+#!endif
+#
+#!ifndef LINK_FLAGS_EXE
+#!error Environment $(ENV_NAME) does not define variable (LINK_FLAGS_EXE).
+#!endif
+#
 
 # -----------------------------------------------------------------------------
@@ -279 +302 @@
 BUILD_ENVS_BASE_PRE_16  = buildsetup emx cvs toolkit40 ddkbase
 
-
-# Check if there is any change in the environment OR if the environment is
-# uncertain (_BUILD_PROJECT not right).
-# If there are Then we will have to forward all target commands to the
-# correct shell environment
-!if "$(_BUILD_PROJECT)" != "$(BUILD_PROJECT)" || "$(BUILD_ENV)" != "$(BUILD_ENV_FORCE)" || "$(BUILD_ENVS_PRE)" != "" || "$(BUILD_ENVS_POST)" != ""
+#
+# Forwarding processing.
+#
+!if $(BUILD_FORWARDING)
+
 MAKE_INCLUDE_PROCESS = $(PATH_MAKE)\process.forwarder.mak
 
@@ -307 +329 @@
 #! endif
 
-# flag that we're forwarding.
-BUILD_FORWARDING = 1
 
 # set the secret _build_project env.var.
@@ -345 +365 @@
 ! endif
 
-!else
-# Flag that we're not forwarding
-BUILD_FORWARDING = 0
-!endif
-
-
-!endif # MAKE_SETUP_INCLUDED
+!endif # BUILD_FORWARDING
+