Changeset 1588

Timestamp:

Jun 28, 2011, 1:49:33 AM (14 years ago)

Author:

John Small

Message:

1) Fix bug causing crash during NNTP send.
2) Changed version format to use x.yy.x format consistently
3) Added support for SMTP ports other than 25
4) Improved internal documentation for ReleaseTool.cfg

Location:

trunk

Files:

• ReleaseTool.cfg (modified) (7 diffs)
• ReleaseTool.cmd (modified) (9 diffs)

trunk/ReleaseTool.cfg

@@ -20 +20 @@
 ;     Section lines mark the start of a new set of data.  The section
 ;     name (within the brackets) defines which type of data follows.
-;     Initially ReleaseTool supports only two section names: FTP and NNTP.
+;     ReleaseTool currently supports section names: FTP, NNTP and SMTP.
 
 ;     FTP sections are used to define data for uploading one or more files
@@ -27 +27 @@
 ;     NNTP sections are used to define data for uploading messages to one
 ;     or more newsgroups on a single newsgroup server.
+
+;     SMTP sections are used to define data for sending email messages
+;     through a single email server. SMTP sections can be set up to use
+;     an external program, like PMMail/2 or REXXMAIL, by defining an
+;     appropriate command. If no command is defined then email is sent
+;     using Releasetool's internal REXX code for opeing a socket to an
+;     SMTP server, loggin in and sending the message.
 
 ;  4) Data lines. These lines provide the actual data to ReleaseTool.
@@ -66 +73 @@
 ;                                         in the same directory as ReleaseTool.
 ;     NEWSGROUPS           NNTP     1     A comma-separated list of newsgroups for this host.
+;     PORT                 SMTP     5     Port number. Default: port 25
 
 ;     Codes:
@@ -72 +80 @@
 ;        3: Required, one or more per section
 ;        4: Optional, one or more per section
+;        5: Optional, one per section
 
 ;     "Special" key-values:
@@ -87 +96 @@
 
 ;     "From" notes:
-;        -  For newsgroups you may want to use a disguied email address to avoid spam.
+;        -  For newsgroups you may want to use a disguised email address to avoid spam.
 ;        -  Accepted formats:
 ;           "Full name" <user@domain.net>
@@ -121 +130 @@
 
 [NNTP]                  ; ReleaseTool user's news server/groups definition
-Newsgroups  = comp.os.os2.apps,comp.os.os2.utilities
-;Newsgroups  = alt.test
+;Newsgroups  = comp.os.os2.apps,comp.os.os2.utilities
+Newsgroups  = alt.test
 Host        =
 Userid      =
@@ -134 +143 @@
 ;Command     = call d:\utils\internet\rexxmail\rexxmail /NewMessageSend "%%TO%% ?subject=%%SUBJECT%% &body=%%MESSAGE_BODY_FILE%%" /Address=%%FROM%% /SMTPServer=%%SERVER%% /SMTPUSER=%%USERID%% /SMTPPASSWORD=%%PASSWORD%% /TimeZone=%%UTCOFFSET%%
 Host        = smtp.toast.net
+Port        = 587
 Userid      = jsmall@toast.net
 From        = "John Small" <jsmall@os2world.net>

trunk/ReleaseTool.cmd

@@ -744 +744 @@
          do
             say
-            call charout , 'Please enter the version (x.yy.zz) for the pending release: '
+            call charout , 'Please enter the version (x.yy.z) for the pending release: '
             ver.in = linein()
          end
@@ -766 +766 @@
    ver.full       = ver.major || '.' || ver.minor || '.' || ver.CSDlevel
    ver.list       = ver.major || '.' || right(ver.minor, 2, '0') || '.' || right(ver.CSDlevel, 2, '0')
-   ver.wpi        = translate(ver.list, '-', '.')
-   ver.tag        = translate(ver.list, '_', '.')
+   ver.wpi        = translate(ver.full, '-', '.')
+   ver.tag        = translate(ver.full, '_', '.')
 return
 
@@ -782 +782 @@
    cfg.FTP.keys   = 'HOST USERID PASSWORD DIRECTORY FILE DESCRIPTIVE_HOSTNAME'
    cfg.NNTP.keys  = 'HOST USERID PASSWORD FROM SIGNATURE NEWSGROUPS'
+/*
    cfg.SMTP.keys  = 'HOST USERID PASSWORD FROM SIGNATURE COMMAND UTCOFFSET'
+*/
+   cfg.SMTP.keys  = 'HOST PORT USERID PASSWORD FROM SIGNATURE COMMAND UTCOFFSET'
 
    cfg.NNTP.signature_preface     = cfg.crlf || '-- ' || cfg.crlf
@@ -835 +838 @@
                key_name = translate(strip(key_name))
                key_value = strip(key_value)
-               if left(key_value, 1) = '"' then
+               if left(key_value, 1) = '"' & key_name \= 'FROM' then
                   parse var key_value '"' key_value '"'
                select
@@ -1476 +1479 @@
    call lineout tempfile, ver.full 'Changes:'
    history_file = 'history'
-   call stream history_file, 'c', 'close'
    do until left(history_line || 'xxx', 3)  = ' o '
       history_line = linein(history_file)
@@ -1935 +1937 @@
          end
 
-   socket = ConnectToMailServer(cfg.SMTP.currentSMTP.host)
+   socket = ConnectToMailServer(cfg.SMTP.currentSMTP.host, cfg.SMTP.currentSMTP.port)
    if socket < 0 then
       do
@@ -2131 +2133 @@
 
 ConnectToMailServer: procedure expose (globals)
+   parse arg email_server_name, email_server_port
+   if strip(email_server_port) = '' then
+      email_server_port = 25
+
    myIPaddr = SockGetHostid()
    rc = SockGetHostByAddr(myIPaddr, 'hoststem.')
@@ -2139 +2145 @@
       end
    cfg.myName = hoststem.name
+/*
    rc = SockGetHostByName(cfg.SMTP.currentSMTP.host, 'hoststem.')
+*/
+   rc = SockGetHostByName(email_server_name, 'hoststem.')
    if rc = 0 then
       do
@@ -2154 +2163 @@
          inetaddr.family = 'AF_INET'
          inetaddr.addr   = serverIPaddr
-         inetaddr.port   = 25
+         inetaddr.port   = email_server_port
          exit_rc         = SockConnect(socket, 'inetaddr.')
       end