Changeset 1239

Timestamp:

Oct 9, 2008, 12:56:38 PM (17 years ago)

Author:

John Small

Message:

Ticket 287: Various Warpin-related code correction/cleanup/improvement:

• Fixed "minimum required version" of Warpin in FM/2 Warpin script
• Simplified SED command by using new command input file, SED.IN
• Changed SED commands to eliminate extraneous blank lines at the top of the "included" files.
• Add/set missing SVN properties
• Miscellaneous code cleanup

Location:

trunk/warpin

Files:

• bld_fm2_wpi.cmd (modified) (5 diffs)
• bld_fm2_wpidirs.cmd (modified) (2 diffs)
• bld_fm2utils_wpi.cmd (modified) (1 diff)
• clean_wpidirs.cmd (modified) (1 diff)
• fm2Utils.wis (modified) (1 diff, 2 props)
• makefile (modified) (2 diffs)
• sed.in (added)

trunk/warpin/bld_fm2_wpi.cmd

@@ -1 @@
-/*  BLD_FM2_WPI - Create a Warpin archive (WPI) for installation of FM/2 */
-
 /*
+ *      $Id: $
+ *
+ * BLD_FM2_WPI - Create a Warpin archive (WPI) for installation of FM/2
+ *
  * Author
  *    John Small
@@ -73 +75 @@
 /* Add the files to the WPI   */
    do
-/*
-      if stream(WPI.archivename, 'c', 'query exists') \= '' then
-         if archive_previous_WPI == 1 then
-            'ren 'WPI.archivename WPI.archivename || '.' || time('S')
-         else
-            'del 'WPI.archivename
-*/
       do p = 1 to WPI.pkg.0
          call SysFileTree WPI.pkg.p.dir || '\*', 'pkgfilelist.', 'FOS'
@@ -101 +96 @@
          call ErrorExit 4 rc
    end
-
-/*
-call Deinit
-*/
 
 /* Exit routines */
@@ -183 +174 @@
 return
 
-/*
-Deinit: procedure expose (globals)
-return
-*/
-
 novalue:
    say 'Error: Uninitialized value: ' || condition('D') || ' encountered on line 'sigl':'
@@ -194 +180 @@
 
 /*=== Error() Report ERROR, FAILURE etc. and exit ===*/
-
 Error:
   say

trunk/warpin/bld_fm2_wpidirs.cmd

@@ -1 +1 @@
 /*
+ * $Id: $
  *
  * REXX code to create and populate directories in preparation for the creation of the
@@ -9 +10 @@
  *       -  Number of packages
  *       -  Package numbers
- *    -  Add logic to copy only if the source is newer
  *    -  Document errors internally (Error. ?)
  *    -  Display more descriptive error messages to user

trunk/warpin/bld_fm2utils_wpi.cmd

@@ -1 @@
-/*  BLD_FM2UTILS_WPI - Create a Warpin archive (WPI) for installation of FM/2 */
-
-/*
+/*
+ * $Id: $
+ *
+ * BLD_FM2UTILS_WPI - Create a Warpin archive (WPI) for installation of FM/2
+ *
  * Author
  *    John Small

trunk/warpin/clean_wpidirs.cmd

@@ -1 @@
-/* REXX program to delete FM/2 Warpin WPI file staging directories */
+/*
+ * $Id: $
+ *
+ * REXX program to empty FM/2 Warpin WPI file staging directories
+ *
+ */
+
 call RxFuncAdd 'SysFileTree', 'REXXUTIL', 'SysFileTree'
 call SysFileTree 'PACKAGE.*', 'pkgdirs.', 'DO'

trunk/warpin/fm2Utils.wis

@@ -1 +1 @@
 <!--
+ $Id$
+
  WARPIN VERSION 0.9.20 is required for PACKAGEID's with revision levels.
  WARPIN VERSION 0.9.9  is required for EXTRACTFROMPCK.

trunk/warpin/makefile

@@ -12 +12 @@
 # 10 Dec 07 SHL Add missing makefile dependencies
 # 10 Dec 07 SHL Set FM2_VER for 3.9.0
+# 07 Oct 08 JBS Changed SED command to use script file and to eliminate
+#               extraneous blank lines with the included files.
 
 !ifndef FM2_VER                  # if defined on wmake command, use it
@@ -61 +63 @@
     ckfiles fm2$(FM2_VER).wpi
 
-fm2.wis: fm2.wis.in fm2utils\fm2utils.doc fm2utils\license.txt makefile
-   sed -e "/@@@include fm2utils.doc@@@/r fm2utils\fm2utils.doc" -e "s/@@@include fm2utils.doc@@@//" -e "/@@@include license.txt@@@/r fm2utils\license.txt" -e "s/@@@include license.txt@@@//" -e "s/@@@FM2_VER@@@/$(FM2_VER)/" -e "s/@@@FM2UTILS_VER@@@/$(FM2UTILS_VER)/" -e "/PACKAGEID/s/-/\\/g" fm2.wis.in >fm2.wis
-#  sed  -e "s/@@@FM2_VER@@@/$(FM2_VER)/" -e "/PACKAGEID/s/-/\\/g" fm2.wis.in >fm2.wis
+fm2.wis: 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
 
 fm2$(FM2_VER).wpi:: bld_fm2_wpidirs.in makefile