Changeset 723

Timestamp:

Jul 5, 2007, 11:34:51 AM (18 years ago)

Author:

John Small

Message:

Improved/reduced the code related to the WarpIN-related macros:
FM2_VER, FM2UTILS_VER and BUILD_FM2UTILS.

File:

• trunk/makefile (modified) (2 diffs)

trunk/makefile

@@ -22 +22 @@
 BASE = fm3
 
-# FM2_VER defines fm/2 WPI file name suffix
-# e.g. FM2_VER=-3-5-9 results in FM2-3-5-9.wpi being built
-# If FM2_VER is empty, then FM2.wpi is built
-# NOTE: Start the value with '-'
+# Pass values for FM2_VER, FM2UTILS_VER and BUILD_FM2UTILS which
+# have been set on the command line, if any, on to the
+# warpin\makefile using the WARPIN_OPTS macro.
 
-!ifndef FM2_VER                  # if defined on wmake command, use it
-FM2_VER=-3-6-0                   # default value
-!ifdef %FM2_VER                  # if defined via env. var.
-FM2_VER=$(%FM2_VER)              #     use the env. var.
-!endif
+!ifdef FM2_VER                  # if defined on wmake command, pass it
+WARPIN_OPTS = FM2_VER=$(FM2_VER)
 !endif
 
-# FM2UTILS_VER defines the fm2utils WPI file name suffix.
-# e.g. FM2UTILS_VER=-1-0 results in FM2Utils-1.0.wpi being built
-# If FM2UTILS_VER is empty, then FM2UTILS.wpi is built
-# NOTE: Start the value with '-'
-
-!ifndef FM2UTILS_VER             # if defined on wmake command, use it
-FM2UTILS_VER=-1-1                # default value
-!ifdef %FM2UTILS_VER             # if defined via env. var.
-FM2UTILS_VER=$(%FM2UTILS_VER)    #     use the env. var.
-!endif
+!ifdef FM2UTILS_VER             # if defined on wmake command, pass it
+WARPIN_OPTS = $(WARPIN_OPTS) FM2UTILS_VER=$(FM2UTILS_VER)
 !endif
 
-# If BUILD_FM2UTILS = 1, build FM2UTILS*.wpi and FM2*.wpi
-# Otherwise build just FM2*.wpi
-
-!ifndef BUILD_FM2UTILS           # if defined on wmake command, use it
-!ifdef %BUILD_FM2UTILS           # else if defined via env. var.
-!ifneq %BUILD_FM2UTILS 1         #     if env. var. is anything but 1
-BUILD_FM2UTILS=0                 #     use a value of 0
-!else
-BUILD_FM2UTILS=1
-!endif
-!else
-BUILD_FM2UTILS=0                 # use default value if not defined via env. or command line
-!endif
+!ifdef BUILD_FM2UTILS           # if defined on wmake command, pass it
+WARPIN_OPTS = $(WARPIN_OPTS) BUILD_FM2UTILS=$(BUILD_FM2UTILS)
 !endif
 
@@ -92 +69 @@
 wpi: .symbolic
    cd warpin
-   $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) FM2_VER=$(FM2_VER) FM2UTILS_VER=$(FM2UTILS_VER) BUILD_FM2UTILS=$(BUILD_FM2UTILS)
+   $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(WARPIN_OPTS)
    cd ..