Changeset 1294

Timestamp:

Nov 23, 2008, 2:08:17 AM (17 years ago)

Author:

John Small

Message:

Ticket 297: ReleaseTool/Edit 1) Fix bugs in version edits;
2) Support for an optional trace parameter; 3) Support for EDITOR env var
(ReleaseTool); 4) Improved "usage" routine

Location:

trunk

Files:

• ReleaseEdit.cmd (modified) (7 diffs)
• ReleaseTool.cmd (modified) (10 diffs)

trunk/ReleaseEdit.cmd

@@ -2 +2 @@
  * $Id$
  *
- * ReleaseEdit: a program which will set the version number
- *    and the date and time of a FM/2 release
+ * ReleaseEdit: a program which will edit a file and set the version
+ *    number and the date of an FM/2 release as appropriate for that file.
+ *    This program operates non-interactively.
  *
  * Usage:
- *    ReleaseEdit <version> <relative-filename>
- *
- *    where <version> is x.y.z
- *
- *    and <relative-filename> is ONE of the files (i.e. no wildcards)
- *    which need a version number and/or date/time:
- *       *.def, file_id.diz, dll\version.h, warpin\fm2.wis
+ *    ReleaseEdit <version> <relative-filename> [trace=<trace-option>]
+ *
+ *    where
+ *       <version> is in the form x.y.z or x.y (where x, y and z are numbers)
+ *       <relative-filename> is ONE of the files (i.e. no wildcards)
+ *          which need a version number and/or date set. For example:
+ *             *.def, file_id.diz, dll\version.h, warpin\fm2.wis
+ *       <trace-option> is a valid comnbination of trace options:
+ *          '? a c e f i l n o r'. This is an OPTIONAL parameter.
+ *
+ * Examples:
+ *    ReleaseEdit 3.15.0 av2.def
+ *    ReleaseEdit 3.15.0 fm3.def trace=i
  *
  * Change log:
@@ -30 +37 @@
  *       - improved error handling: tmp file renamed back to deleted file
  *       - improved "usage" routine
+ *    22 Nov 08 JBS Ticket 297
+ *       - Fix bugs in version edits and added
+ *       - Support for an optional trace parameter.
+ *       - Improved "usage" routine
+ *       - Suppressed output of 'del' commands
  *
 */
 
 n = setlocal()
+
+parse arg args
+p = pos('TRACE=', translate(args))
+if p > 0 then
+   do
+      args = args || ' ' /* make sure there's a space at the end */
+      traceopt = substr(args, p+6, pos(' ', args, p+5) - (p+6))
+      args = delstr(args, p, 6+length(traceopt))
+      if traceopt \= '' then
+         if verify(translate(traceopt), '?ACEFILNOR') = 0 & length(traceopt) < 3 then
+            trace value traceopt
+   end
 
 signal on Error
@@ -44 +68 @@
 signal on novalue             /* for debugging */
 */
-
 /*
    sed_separator:
@@ -59 +82 @@
 
 /* Process parameters */
-parse arg ver file .
+parse var args ver file .
 if ver = '' | file = '' then
    call Usage           /* and exit */
@@ -153 +176 @@
             do
                say 'Processing file:' file
-               'grep -E "^#define.*COPYRIGHT_YEAR.*' || year || '" ' || file || ' >nul || del ' || file || ' && sed -r -e "/#define.*COPYRIGHT_YEAR/s/[0-9]+/' || year || '/" ' || tmpfile || ' >' file
+               'grep -E "^#define.*COPYRIGHT_YEAR.*' || year || '" ' || file || ' >nul || del ' || file || '>nul 2>nul && sed -r -e "/#define.*COPYRIGHT_YEAR/s/[0-9]+/' || year || '/" ' || tmpfile || ' >' file
             end
          else
@@ -183 +206 @@
 end
 exit_routine:
-'@if exist' tmpfile 'del' tmpfile
+'@if exist' tmpfile 'del' tmpfile '>nul 2>nul'
 n = endlocal()
 return
@@ -239 +262 @@
       say srcline
       i = i + 1
+      if (i // 22) = 0 then
+         '@pause'
    end
 

trunk/ReleaseTool.cmd

@@ -10 +10 @@
  *
  * Usage:
- *    ReleaseTool [<this-version-number>] [<next-version-number>]
+ *    ReleaseTool [trace=<trace-option>]
  *
- *    where the version number(s) are optional and of the form x.y.z
- *
- * This program will reformat the version numbers to suit their use:
- *    tag names
- *    wpi filenames
- *    warpin packageid/database version number(s)
+ *    where
+ *       <trace-option> is a valid comnbination of trace options:
+ *          '? a c e f i l n o r'. This is an OPTIONAL parameter.
  *
  * This program uses the following enviromental variables, if set
- *    SVN_EDITOR to set the text editor that is called
+ *    SVN_EDITOR or EDITOR to set the text editor that is called
  *    SVN_TESTER to call a cmd file that copies files to your test directory
  *               and changes to that directory
@@ -34 +31 @@
  *       - Removed extraneous 'pause' in option 20
  *       - Fixed a bug in option 0 (run a command shell)
+ *    22 Nov 08 JBS Ticket 297
+ *       - Fix bugs in version edits
+ *       - Support for an optional trace parameter.
+ *       - Support for EDITOR env var
+ *       - Improved "usage" routine
  *
 */
@@ -50 +52 @@
 
 
-globals = 'cmd prompt editor editorcmds killpid tester killtarget version_filelist pager prev_action'
-
-parse arg ver next_ver
-if (pos('?', ver) > 0 | pos('h', ver) > 0) then
-   signal Usage      /* and exit */
+globals = 'ver cmd prompt editor editorcmds killpid tester killtarget version_filelist pager prev_action'
+
+parse arg args
+p = pos('TRACE=', translate(args))
+if p > 0 then
+   do
+      args = args || ' ' /* make sure there's a space at the end */
+      traceopt = substr(args, p+6, pos(' ', args, p+5) - (p+6))
+      args = delstr(args, p, 6+length(traceopt))
+      if traceopt \= '' then
+         if verify(translate(traceopt), '?ACEFILNOR') = 0 & length(traceopt) < 3 then
+            trace value traceopt
+   end
+else
+   traceopt = ''
+if strip(args) \= '' then  /* trace= is the only supported parameter */
+   call Usage
 
 call Init
@@ -131 +145 @@
                ver = GetVer('the pending release')
             do f = 1 to words(version_filelist)
-               call ReleaseEdit ver word(version_filelist, f)
+               call ReleaseEdit ver word(version_filelist, f) 'trace=' || traceopt
                say
             end
@@ -307 +321 @@
             next_ver = GetVer('the next release')
             do f = 1 to words(version_filelist)
-               call ReleaseEdit next_ver word(version_filelist, f)
+               call ReleaseEdit next_ver word(version_filelist, f) 'trace=' || traceopt
                say
             end
@@ -339 +353 @@
 Usage:
    say;say;say
-   lastline = sigl - 10
-   do i = 1 to lastline
-      say sourceline(i)
+   i = 1
+   do forever
+      srcline = sourceline(i)
+      if pos('CHANGE LOG', translate(srcline)) > 0 then
+         leave
+      else
+         say srcline
+      i = i + 1
+      if (i // 22) = 0 then
+         '@pause'
    end
 exit
@@ -351 +372 @@
 
    action = 0
+   ver = ''
 
    editor = value('SVN_EDITOR',,'OS2ENVIRONMENT')
-   cmd      = value('COMSPEC',,'OS2ENVIRONMENT')
-   prompt   = value('PROMPT',,'OS2ENVIRONMENT')
-   tester       = value('SVN_TESTER',,'OS2ENVIRONMENT')
-   killpid      = value('SVN_KILL',,'OS2ENVIRONMENT')
-
    editorcmds = ""
-   if editor == '' then
+   if editor = '' then
+      editor = value('EDITOR',,'OS2ENVIRONMENT')
+   if editor = '' then
       editor = 'tedit'
    else
@@ -367 +386 @@
             editorcmds = "'3'"
       end
+   cmd      = value('COMSPEC',,'OS2ENVIRONMENT')
+   prompt   = value('PROMPT',,'OS2ENVIRONMENT')
+   tester       = value('SVN_TESTER',,'OS2ENVIRONMENT')
+   killpid      = value('SVN_KILL',,'OS2ENVIRONMENT')
    if killpid == '' then
        killpid      = 'killpid'
    killtarget  = ' FM/2'
+
    version_filelist = 'av2.def databar.def dirsize.def dll\fm3dll.def dll\fm3res.def'
    version_filelist = version_filelist 'dll\version.h eas.def fm3.def fm4.def global.def ini.def'
@@ -443 +467 @@
    say 'Please enter the version (x.yy.zz) for' ver_text ':'
    ver_value = linein()
-   parse var major '.' minor '.' CSDlevel
+   parse var ver_value major '.' minor '.' CSDlevel
    if minor    = '' then
       minor    = 0
    if CSDlevel = '' then
       CSDlevel = 0
-   if datatype(major) \= 'NUM' | datatype(minor \= 'NUM') | datatype(CSDlevel) \= 'NUM' then
+   if datatype(major) \= 'NUM' | datatype(minor) \= 'NUM' | datatype(CSDlevel) \= 'NUM' then
       do
          say 'Error: Invalid version entered:' ver_value
@@ -537 +561 @@
       call charout , 'OK to proceed with file write? (Y/n) '
       entry = translate(SysGetKey())
-      say;say 'Hex(key):' c2x(entry)
    end