Changeset 723


Ignore:
Timestamp:
Jul 5, 2007, 9:34:51 AM (13 years ago)
Author:
John Small
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/makefile

    r720 r723  
    2222BASE = fm3
    2323
    24 # FM2_VER defines fm/2 WPI file name suffix
    25 # e.g. FM2_VER=-3-5-9 results in FM2-3-5-9.wpi being built
    26 # If FM2_VER is empty, then FM2.wpi is built
    27 # NOTE: Start the value with '-'
     24# Pass values for FM2_VER, FM2UTILS_VER and BUILD_FM2UTILS which
     25# have been set on the command line, if any, on to the
     26# warpin\makefile using the WARPIN_OPTS macro.
    2827
    29 !ifndef FM2_VER                  # if defined on wmake command, use it
    30 FM2_VER=-3-6-0                   # default value
    31 !ifdef %FM2_VER                  # if defined via env. var.
    32 FM2_VER=$(%FM2_VER)              #     use the env. var.
    33 !endif
     28!ifdef FM2_VER                  # if defined on wmake command, pass it
     29WARPIN_OPTS = FM2_VER=$(FM2_VER)
    3430!endif
    3531
    36 # FM2UTILS_VER defines the fm2utils WPI file name suffix.
    37 # e.g. FM2UTILS_VER=-1-0 results in FM2Utils-1.0.wpi being built
    38 # If FM2UTILS_VER is empty, then FM2UTILS.wpi is built
    39 # NOTE: Start the value with '-'
    40 
    41 !ifndef FM2UTILS_VER             # if defined on wmake command, use it
    42 FM2UTILS_VER=-1-1                # default value
    43 !ifdef %FM2UTILS_VER             # if defined via env. var.
    44 FM2UTILS_VER=$(%FM2UTILS_VER)    #     use the env. var.
    45 !endif
     32!ifdef FM2UTILS_VER             # if defined on wmake command, pass it
     33WARPIN_OPTS = $(WARPIN_OPTS) FM2UTILS_VER=$(FM2UTILS_VER)
    4634!endif
    4735
    48 # If BUILD_FM2UTILS = 1, build FM2UTILS*.wpi and FM2*.wpi
    49 # Otherwise build just FM2*.wpi
    50 
    51 !ifndef BUILD_FM2UTILS           # if defined on wmake command, use it
    52 !ifdef %BUILD_FM2UTILS           # else if defined via env. var.
    53 !ifneq %BUILD_FM2UTILS 1         #     if env. var. is anything but 1
    54 BUILD_FM2UTILS=0                 #     use a value of 0
    55 !else
    56 BUILD_FM2UTILS=1
    57 !endif
    58 !else
    59 BUILD_FM2UTILS=0                 # use default value if not defined via env. or command line
    60 !endif
     36!ifdef BUILD_FM2UTILS           # if defined on wmake command, pass it
     37WARPIN_OPTS = $(WARPIN_OPTS) BUILD_FM2UTILS=$(BUILD_FM2UTILS)
    6138!endif
    6239
     
    9269wpi: .symbolic
    9370   cd warpin
    94    $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) FM2_VER=$(FM2_VER) FM2UTILS_VER=$(FM2UTILS_VER) BUILD_FM2UTILS=$(BUILD_FM2UTILS)
     71   $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(WARPIN_OPTS)
    9572   cd ..
    9673
Note: See TracChangeset for help on using the changeset viewer.