Changeset 1256

Timestamp:

Oct 23, 2008, 4:06:46 PM (17 years ago)

Author:

John Small

Message:

Ticket 293: Add chksed target to check for sufficient SED and GREP and
improve support for the "-a" wmake option.

Location:

trunk/warpin

Files:

• ckfiles.cmd (modified) (3 diffs)
• makefile (modified) (3 diffs)

trunk/warpin/ckfiles.cmd

@@ -7 +7 @@
  * these files can first be staged and then added to the WPI file.
  *
+ * Change log:
+ *      23 Oct 08 JBS Ticket 293: Improved support for -a wmake option
  */
 
@@ -14 +16 @@
 signal on novalue
 
-parse arg args
-wpi_file          =  strip(args)
+parse arg '"MAKEOPTS=' make_args '"' wpi_file
+wpi_file          =  strip(wpi_file)
 wis_file          =  'fm2.wis'
 if stream(wpi_file, 'c', 'query exists') == '' then  /* If target WPI file  does not exist, force WIS rebuild */
@@ -32 +34 @@
       say
       say 'Exiting...'
-      return
+      return 1
    end
 out_file_date_time = GetDate(out_file)
 wpi_file_date_time = GetDate(wpi_file)
 
-if in_file_date_time > out_file_date_time | ,
+if pos('A', translate(make_args)) > 0 | ,
+   in_file_date_time > out_file_date_time | ,
    out_file_date_time = dummy_date_time  | ,
    wpi_file_date_time = dummy_date_time         then

trunk/warpin/makefile

@@ -1 @@
-# warpin\makefile - build the FM/2 Warpin installation file: FM2.WIS
+# warpin\makefile - build the FM/2 Warpin installation file: FM2$(FM2_VER).WPI
+
 # $Id$
 
@@ -14 +15 @@
 # 07 Oct 08 JBS Changed SED command to use script file and to eliminate
 #               extraneous blank lines with the included files.
+# 23 Oct 08 JBS Ticket 293: Add "chksed" target to check for sufficient SED and GREP and
+#               improve support for -a option in the checkfiles target.
 
 !ifndef FM2_VER                  # if defined on wmake command, use it
@@ -61 +64 @@
 checkfiles: .symbolic
    @echo Checking to see if files have been changed...
-    ckfiles fm2$(FM2_VER).wpi
+    ckfiles "MAKEOPTS=$(__MAKEOPTS__)" fm2$(FM2_VER).wpi
 
-fm2.wis: fm2.wis.in fm2utils\fm2utils.doc fm2utils\license.txt makefile sed.in
+chksed: .symbolic
+   @sed -V <nul 2>&1 | grep -i "GNU sed" >nul 2>&1 || (@echo. & @echo GNU SED and GREP required and not found on the PATH. & @echo.)
+
+fm2.wis: chksed fm2.wis.in fm2utils\fm2utils.doc fm2utils\license.txt makefile sed.in
    sed -e "s/@@@FM2_VER@@@/$(FM2_VER)/" -e "s/@@@FM2UTILS_VER@@@/$(FM2UTILS_VER)/" -f sed.in fm2.wis.in | sed "/@@@include/{s/@@@include//;N;s/\n//}" >fm2.wis