Changeset 662


Ignore:
Timestamp:
May 12, 2007, 3:09:40 AM (13 years ago)
Author:
John Small
Message:
  • New macros are now supported: FM2_VER and FM2UTILS_VER. These macros

define strings to be used in building the FM2 and FM2UTILS WPI files.
For example: FM2_VER=-3-5-9 results in FM2-3-5-9.WPI being built.
By default FM2_VER and FM2UTILS_VER are null strings and FM2.WPI and
FM2UTILS.WPI are built.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/warpin/makefile

    r654 r662  
    33# Environment:
    44
     5BASE = fm3
     6
    57# DEBUG  0 = release build, 1 = debug build
    68
    7 BASE = fm3
     9# BUILD_FM2UTILS
     10#     If defined, then building FM2UTILS*.wpi is included in the ALL and WPI targets
     11
     12# FM2_VER
     13#     Used for the WPI file name. e.g. FM2_VER=-3-5-9 results in FM2-3-5-9.wpi being built
     14#     If FM2_VER is undefined, then FM2.wpi is built
     15#     NOTE: Start the variable with '-'!
     16
     17# FM2UTILS_VER
     18#     Used for the WPI file name. e.g. FM2UTILS_VER=-1-0 results in FM2Utils-1.0.wpi being built
     19#     If FM2UTILS_VER is undefined, then FM2UTILS.wpi is built
     20#     NOTE: Start the variable with '-'!
    821
    922all: wpi
    1023
    11 wpi: checkfiles fm2.wpi fm2utils.wpi
     24wpi: checkfiles fm2$(FM2_VER).wpi fm2utils$(FM2UTILS_VER).wpi
    1225
    1326checkfiles:
    1427   @echo Checking to see if files have been changed...
    15     ckfiles
     28    ckfiles fm2$(FM2_VER).wpi
    1629
    17 fm2.wpi:: bld_fm2_wpidirs.in
     30fm2.wis: fm2.wis.in
     31   sed -e "s/###FM2UTILS_VER###/$(FM2UTILS_VER)/g" -e "/###include fm2utils.doc###/r fm2utils\fm2utils.doc" -e "s/###include fm2utils.doc###//g" -e "/###include license.txt###/r fm2utils\license.txt" -e "s/###include license.txt###//g" fm2.wis.in >fm2.wis
     32
     33fm2$(FM2_VER).wpi:: bld_fm2_wpidirs.in
    1834   @echo Staging files for WPI file...
    1935   bld_fm2_wpidirs
    2036   @echo Creating/updating the WPI file
    21    bld_fm2_wpi
     37   bld_fm2_wpi fm2$(FM2_VER).wpi
    2238
    23 fm2.wpi:: fm2.wis
     39fm2$(FM2_VER).wpi:: fm2.wis
    2440   @echo Inserting the new Warpin script into the WPI file...
    25    bld_fm2_wpi /SCRIPT
     41   bld_fm2_wpi fm2$(FM2_VER).wpi /SCRIPT
    2642
     43fm2utils$(FM2UTILS_VER).wpi: bld_fm2utils_wpi.cmd fm2utils.wis fm2utils\fm2utils.doc fm2utils\license.txt ..\shadowmgr.cmd
    2744!ifdef BUILD_FM2UTILS
    28 fm2utils.wpi: bld_fm2utils_wpi.cmd fm2utils.wis fm2utils\fm2utils.doc fm2utils\license.txt ..\shadowmgr.cmd
    2945   @echo Building FM2Utils
    30    bld_fm2utils_wpi
     46   bld_fm2utils_wpi fm2utils$(FM2UTILS_VER).wpi
    3147!endif
    3248
    3349distclean:
    34   -if exist fm2.wpi del fm2.wpi
    35   -if exist fm2utils.wpi del fm2utils.wpi
     50  -if exist fm2$(FM2_VER).wpi del fm2$(FM2_VER).wpi
     51  -if exist fm2utils$(FM2UTILS_VER).wpi del fm2utils$(FM2UTILS_VER).wpi
    3652  -if exist bld_fm2_wpidirs.in del bld_fm2_wpidirs.in
    3753  clean_wpidirs
Note: See TracChangeset for help on using the changeset viewer.