Changeset 662

Timestamp:

May 12, 2007, 5:09:40 AM (19 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:

• trunk/warpin/makefile (modified) (1 diff)

trunk/warpin/makefile

@@ -3 +3 @@
 # Environment:
 
+BASE = fm3
+
 # DEBUG  0 = release build, 1 = debug build
 
-BASE = fm3
+# BUILD_FM2UTILS
+#     If defined, then building FM2UTILS*.wpi is included in the ALL and WPI targets
+
+# FM2_VER
+#     Used for the WPI file name. e.g. FM2_VER=-3-5-9 results in FM2-3-5-9.wpi being built
+#     If FM2_VER is undefined, then FM2.wpi is built
+#     NOTE: Start the variable with '-'!
+
+# FM2UTILS_VER
+#     Used for the WPI file name. e.g. FM2UTILS_VER=-1-0 results in FM2Utils-1.0.wpi being built
+#     If FM2UTILS_VER is undefined, then FM2UTILS.wpi is built
+#     NOTE: Start the variable with '-'!
 
 all: wpi
 
-wpi: checkfiles fm2.wpi fm2utils.wpi
+wpi: checkfiles fm2$(FM2_VER).wpi fm2utils$(FM2UTILS_VER).wpi
 
 checkfiles:
    @echo Checking to see if files have been changed...
-    ckfiles
+    ckfiles fm2$(FM2_VER).wpi
 
-fm2.wpi:: bld_fm2_wpidirs.in
+fm2.wis: fm2.wis.in
+   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
+
+fm2$(FM2_VER).wpi:: bld_fm2_wpidirs.in
    @echo Staging files for WPI file...
    bld_fm2_wpidirs
    @echo Creating/updating the WPI file
-   bld_fm2_wpi
+   bld_fm2_wpi fm2$(FM2_VER).wpi
 
-fm2.wpi:: fm2.wis
+fm2$(FM2_VER).wpi:: fm2.wis
    @echo Inserting the new Warpin script into the WPI file...
-   bld_fm2_wpi /SCRIPT
+   bld_fm2_wpi fm2$(FM2_VER).wpi /SCRIPT
 
+fm2utils$(FM2UTILS_VER).wpi: bld_fm2utils_wpi.cmd fm2utils.wis fm2utils\fm2utils.doc fm2utils\license.txt ..\shadowmgr.cmd
 !ifdef BUILD_FM2UTILS
-fm2utils.wpi: bld_fm2utils_wpi.cmd fm2utils.wis fm2utils\fm2utils.doc fm2utils\license.txt ..\shadowmgr.cmd
    @echo Building FM2Utils
-   bld_fm2utils_wpi
+   bld_fm2utils_wpi fm2utils$(FM2UTILS_VER).wpi
 !endif
 
 distclean:
-  -if exist fm2.wpi del fm2.wpi
-  -if exist fm2utils.wpi del fm2utils.wpi
+  -if exist fm2$(FM2_VER).wpi del fm2$(FM2_VER).wpi
+  -if exist fm2utils$(FM2UTILS_VER).wpi del fm2utils$(FM2UTILS_VER).wpi
   -if exist bld_fm2_wpidirs.in del bld_fm2_wpidirs.in
   clean_wpidirs