Changeset 1542

Timestamp:

Jul 11, 2010, 1:54:17 PM (15 years ago)

Author:

John Small

Message:

ReleaseTool: 1) An initial attempt at support for sending emails, access to SmartSVN, a change to how 4OS2 is detected, new option to copy WARNALL.LOG to WARNALL.BASE, A simulated TEE if needed

Location:

trunk

Files:

• ReleaseTool.cfg (modified) (1 diff)
• ReleaseTool.cmd (modified) (22 diffs)

trunk/ReleaseTool.cfg

@@ -112 +112 @@
 Password     =
 
+[SMTP]
+Command      = g:\pmmail\bin\pmmsend -a G:\PMMail\Accounts\ygk_us0.act -t "%%TO%%" -s "%%SUBJECT%%" -m %%MESSAGE_BODY_FILE%%

trunk/ReleaseTool.cmd

@@ -53 +53 @@
  *    31 May 10 JBS Build zip file and Hobbes txt file in Warpin directory
  *
+ * To Do
+ *    -  Improve support for external CMD files which perform some or all of a task
+ *    -  Support sending email via PMMSend?
+ *    -  Support sending email via REXXMail?
 */
 
@@ -67 +71 @@
 */
 
-globals = 'cfg. ver. mainmenu. cmd. Hobbes. loaded. prev_user_choice'
+globals = 'cfg. ver. mainmenu. cmd. Hobbes. available. prev_user_choice'
 
 parse arg args
@@ -164 +168 @@
                   prev_user_choice = user_choice
                end
+            when user_choice = 'S' then
+               do /* Open a command line */
+                  dirsave = directory()
+                  svndrive = filespec('D', cmd.smartsvn)
+                  svndrive_dirsave = directory(svndrive)
+                  call directory strip(svndrive || filespec('P', cmd.smartsvn), 'T', '\')
+                  call ExecCmd 'call smartsvn.cmd'
+                  call directory svndrive_dirsave
+                  call directory dirsave
+                  say;say
+                  say 'If SmartSVN did not run correctly, make sure the default Java'
+                  say 'is Java 1.4.1 or later before running ReleaseTool.'
+                  prev_user_choice = user_choice
+               end
             when user_choice = mainmenu.Ensure_work_done_num then
                do /* Ensure all work (by others) is comitted */
-                  call NotYet user_choice
-                  say 'Notify programmers to commit their work for this release.'
-                  say
-                  say 'Use the Netlabs FM/2 Developer''s mailing list and wait 24 hours.'
+                  if cfg.SMTP.1.Command = '' then
+                     do
+                        say
+                        say 'A "send-email" command was not found in' cfg.filename || '.'
+                        say 'So this will have to be done manually.'
+                        say
+                        say 'Notify programmers to commit their work for this release.'
+                        say
+                        say 'Use the Netlabs FM/2 Developer''s mailing list and wait 24 hours.'
+                     end
+                  else
+                     do
+                        say
+                        say 'Sending a noptification email to FM/2 developers...'
+                        say
+                        say 'Proposed subject:'
+                        subj = 'Commit work for FM/2' ver.full
+                        say '   ' || subj
+                        say
+                        say 'If this subject is acceptable, just press Enter. Otherwise'
+                        say 'type in the desired subject for the notification email:'
+                        response = strip(linein())
+                        if response \= '' then
+                           subj = response
+                        SMTPBody_file = SysTempFilename('SMTPBody.???')
+                        call lineout SMTPBody_file, 'The release of FM/2' ver.full 'is imminent.'
+                        call lineout SMTPBody_file, ''
+                        call lineout SMTPBody_file, 'Please commit all work for this release within 24 hours.'
+                        call lineout SMTPBody_file, ''
+                        call lineout SMTPBody_file, 'Reply to this email if there are reasons to delay the release.'
+                        call stream  SMTPBody_file, 'c', 'close'
+                        say
+                        say 'The proposed body of the notification email will now be loaded into an editor.'
+                        say 'Make desired changes, if any, and save the file.'
+                        say
+                        call charout, 'Press any key when ready to load the message body into an editor: '
+                        call SysGetKey
+                        say
+                        call ExecCmd cmd.editor SMTPBody_file
+                        call SendSMTP 'TO=fm2-dev@netlabs.org <fm2-dev@netlabs.org>', ,
+                                      'SUBJ=' || subj, ,
+                                      'BODYFILE=' || SMTPBody_file
+                        call SysFileDelete SMTPBody_file
+                     end
                   prev_user_choice = user_choice
                end
@@ -188 +246 @@
             when user_choice = mainmenu.Check_SVN_status_num then
                do /* Ensure all local source is up to date */
-                  if right(translate(cmd.processor), 8) = '4OS2.EXE' then
+                  if cmd.processor_is_4os2 = 1 then
                      svn_cmd = 'svn status -v |&' cmd.pager
                   else
@@ -222 +280 @@
             when user_choice = mainmenu.WARNALL_build_num then
                do /* Ensure the edits build */
+                  say
                   'set WARNALL=1'
                   call ExecCmd 'wmake -a all | tee warnall.log |' cmd.pager
@@ -227 +286 @@
                   call ExecCmd 'diff.exe -rub warnall.base warnall.log > warnall.diff'
                   call ExecCmd cmd.editor 'warnall.diff'
+                  say
+                  call charout , 'Make WARNALL.LOG the new WARNALL.BASE? (y/N): '
+                  if translate(SysGetKey()) = 'Y' then
+                     'copy WARNALL.LOG WARNALL.BASE'
+                  say
                   prev_user_choice = user_choice
                end
@@ -334 +398 @@
             when user_choice = mainmenu.Announce_num then
                do /* Announce the release. */
-                  if loaded.RXSOCK = 1 then
+                  if available.RXSOCK = 1 then
                      call AnnounceToNewsgroups
                   else
@@ -361 +425 @@
             '@pause'
       end
+      if available.tee = 0 then
+         call SysFileDelete 'tee.cmd'
 end
 
@@ -374 +440 @@
    call RxFuncAdd "SockLoadFuncs", "RXSOCK", "SockLoadFuncs"
    call SockLoadFuncs 0
-   loaded.RXSOCK = 1
+   available.RXSOCK = 1
 
 /*
@@ -386 +452 @@
    rcx = 1
    if rcx = 1 then
-      loaded.RXSOCK = 1
+      available.RXSOCK = 1
    else
       do
-         loaded.RXSOCK = 0
+         available.RXSOCK = 0
          call RxFuncDrop "SockLoadFuncs", "RXSOCK", "SockLoadFuncs"
          say
@@ -408 +474 @@
    signal on syntax name Error
    if rcx = 1 then
-      loaded.RXFTP = 1
+      available.RXFTP = 1
    else
       do
-         loaded.RXFTP = 0
+         available.RXFTP = 0
          say
          say 'RXFTP.DLL load failed.'
@@ -445 +511 @@
    cmd.           = ''
    cmd.processor  = value('COMSPEC',,'OS2ENVIRONMENT')
+   cmd.processor_is_4os2 = Is4OS2()
+   if cmd.processor_is_4os2 = 1 then
+      available.tee = 1
+   else
+      do
+         if SysSearchPath('PATH', 'tee.exe') \= '' then
+            available.tee = 1
+         else
+            do
+               available.tee = 0
+               call SysFileDelete 'tee.cmd'
+               call lineout 'tee.cmd', '/* */'
+               call lineout 'tee.cmd', 'parse arg filename'
+               call lineout 'tee.cmd', 'call SysFileDelete filename'
+               call lineout 'tee.cmd', 'do while lines() > 0'
+               call lineout 'tee.cmd', '   parse pull line'
+               call lineout 'tee.cmd', '   call lineout filename, line'
+               call lineout 'tee.cmd', '   say line'
+               call lineout 'tee.cmd', 'end'
+               call lineout 'tee.cmd', "call stream filename, 'c', 'close'"
+               call stream  'tee.cmd', 'c', 'close'
+            end
+      end
    userprompt = value('PROMPT',,'OS2ENVIRONMENT')
    parse var userprompt . '$e[' colorset 'm' .
@@ -474 +563 @@
       end
 
+   cmd.smartsvn   = SysSearchPath('PATH', 'smartsvn.cmd')
    cmd.tester     = value('SVN_TESTER',,'OS2ENVIRONMENT')
-   cmd.killpid        = value('SVN_KILL',,'OS2ENVIRONMENT')
-   if cmd.killpid == '' then
-      cmd.killpid      = 'killpid'
-   cmd.killtarget  = 'FM/2'
+   cmd.killpid    = value('SVN_KILL',,'OS2ENVIRONMENT')
+   if cmd.killpid = '' then
+      cmd.killpid = 'killpid'
+   cmd.killtarget = 'FM/2'
 
    m = 0
@@ -588 +678 @@
    cfg.FTP.keys   = 'DESCRIPTIVE_HOSTNAME HOST USERID PASSWORD DIRECTORY FILE'
    cfg.NNTP.keys  = 'NEWSGROUPS HOST USERID PASSWORD'
-   cfg.SMTP.keys  = ''
+   cfg.SMTP.keys  = 'COMMAND'
 
    cfg.NNTP.closing               = cfg.crlf || cfg.crlf || '.' || cfg.crlf
@@ -675 +765 @@
       end
       say
-      call charout , 'N)ext C)ommandline Q)uit or mennu item number: '
+      call charout , 'N)ext C)ommandline '
+      if cmd.smartsvn \= '' then
+         call charout , 'S)martSVN '
+      call charout , 'Q)uit or mennu item number: '
       user_choice = translate(translate(SysGetKey()), 'N', '0d'x)
-      if user_choice = 'N' | user_choice = 'C' | user_choice = 'Q' then
+      if user_choice = 'N' | ,
+         user_choice = 'C' | ,
+         user_choice = 'Q' | ,
+         (cmd.smartsvn \= '' & user_choice = 'S') then
          leave
       if datatype(user_choice) = 'NUM' then
@@ -689 +785 @@
          end
    end
+   say
    if user_choice = 'N' then
       if prev_user_choice = 'N/A' then
@@ -804 +901 @@
 Commandline: procedure expose (globals)
    signal off Error
-   if right(translate(cmd.processor), 8) = '4OS2.EXE' then
+   if cmd.processor_is_4os2 = 1 then
       '@' || cmd.processor "prompt"  cmd.prompt
    else
@@ -817 +914 @@
    signal on Error
 return
+
+/*=== Is4OS2() Return true if 4OS2 running ===*/
+Is4OS2: procedure
+  call setlocal
+  '@set X=%@eval[0]'
+  yes = value('X',, 'OS2ENVIRONMENT') = 0
+  call endlocal
+return yes                              /* if running under 4OS2 */
 
 RunTester: procedure expose (globals)
@@ -1078 +1183 @@
                            say '   ' tmpzipfile
                            say 'as an attachment. In the text of the message, please describe'
-                           say 'the errors you detected in detail. Thank you.'
+                           say 'the errors you detected in detail. After the email has been sent'
+                           say 'you may delete:'
+                           say '   ' tmpzipfile
                            say
                            'pause'
@@ -1091 +1198 @@
 
 UploadRelease: procedure expose (globals)
-   if loaded.RXFTP = 0 then
+   if available.RXFTP = 0 then
       do
          say 'Until RXFTP.DLL is placed in a directory on the LIBPATH,'
@@ -1577 +1684 @@
 return
 
+SendSMTP: procedure expose (globals)
+   email_command = cfg.SMTP.1.Command
+   do i = 1 to arg()
+      parse value arg(i) with key '=' key_value
+      key = translate(key)
+      select
+         when (key = 'TO' & pos('%%TO%%', email_command) > 0) then
+            do
+               parse var email_command part1 '%%TO%%' part2
+               email_command = part1 || key_value || part2
+            end
+         when (key = 'SUBJ' & pos('%%SUBJECT%%', email_command) > 0) then
+            do
+               parse var email_command part1 '%%SUBJECT%%' part2
+               /* JBS: Test code */
+               email_command = part1 || '[TEST message. Ignore] ' || key_value || part2
+/*
+               email_command = part1 || key_value || part2
+*/
+            end
+         when (key = 'BODYFILE' & pos('%%MESSAGE_BODY_FILE%%', email_command) > 0) then
+            do
+               parse var email_command part1 '%%MESSAGE_BODY_FILE%%' part2
+               email_command = part1 || stream(key_value, 'c', 'query exists') || part2
+            end
+         otherwise
+            say 'Program error: Unknown param: "' || arg(i) || '" for SendSMTP function.'
+      end
+   end
+   /* JBS: Test code */
+   say
+   say 'While the new email code is being tested and debugged:'
+   say '1) All subjects will be prefaced by: "[TEST message. Ignore]"'
+   say '2) A "preview" of the pending email command will be displayed.'
+   say
+   say 'If the email command is unsuccessful, please copy and paste it and'
+   say 'post it, along with a description of the error(s) and, if possible,'
+   say 'a proposed correction to the fm2-dev mailiing list.'
+   say
+   say 'The pending email command:'
+   say '   ' email_command
+   say
+   call charout , 'Press any key when ready to execute this command...'
+   call SysGetKey
+   say;say
+   call ExecCmd email_command
+return
+
 /*** Usage/Error routines ***/
 
@@ -1644 +1799 @@
 return
 
-Log_Error: procedure expose cfg.
-return
-