Author: hwright
Date: Mon Jun 27 17:53:54 2011
New Revision: 1140253

URL: http://svn.apache.org/viewvc?rev=1140253&view=rev
Log:
release.py: Add a new subcommand to create the emailed release announcements.
This replaces write-announcement.py.

* tools/dist/templates/stable-release-ann.ezt:
  New.

* tools/dist/release.py
  (write_announcement): New.
  (main): Add the new subcommand.

* tools/dist/write-announcement.py:
  Remove.

Added:
    subversion/trunk/tools/dist/templates/stable-release-ann.ezt
Removed:
    subversion/trunk/tools/dist/write-announcement.py
Modified:
    subversion/trunk/tools/dist/release.py

Modified: subversion/trunk/tools/dist/release.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1140253&r1=1140252&r2=1140253&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Mon Jun 27 17:53:54 2011
@@ -412,8 +412,25 @@ def write_news(base_dir, args):
     template.generate(sys.stdout, data)
 
 
-def announce(base_dir, args):
+def write_announcement(base_dir, args):
     'Write the release announcement.'
+    (version_base, version_extra) = split_version(args.version)
+
+    data = { 'version'      : args.version,
+             'sha1info'     : 'foo',
+             'siginfo'      : 'bar', 
+             'major-minor'  : 'boo',
+           }
+
+    if version_extra:
+        if version_extra.startswith('alpha'):
+            template_filename = 'rc-release-ann.ezt'
+    else:
+        template_filename = 'stable-release-ann.ezt'
+
+    template = ezt.Template(compress_whitespace = False)
+    template.parse(get_tmplfile(template_filename).read())
+    template.generate(sys.stdout, data)
 
 
 #----------------------------------------------------------------------
@@ -483,6 +500,13 @@ def main():
     subparser.add_argument('version',
                     help='''The release label, such as '1.7.0-alpha1'.''')
 
+    subparser = subparsers.add_parser('write-announcement',
+                    help='''Output to stdout template text for the emailed
+                            release announcement.''')
+    subparser.set_defaults(func=write_announcement)
+    subparser.add_argument('version',
+                    help='''The release label, such as '1.7.0-alpha1'.''')
+
     # A meta-target
     subparser = subparsers.add_parser('clean',
                     help='''The same as the '--clean' switch, but as a

Added: subversion/trunk/tools/dist/templates/stable-release-ann.ezt
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/templates/stable-release-ann.ezt?rev=1140253&view=auto
==============================================================================
--- subversion/trunk/tools/dist/templates/stable-release-ann.ezt (added)
+++ subversion/trunk/tools/dist/templates/stable-release-ann.ezt Mon Jun 27 
17:53:54 2011
@@ -0,0 +1,32 @@
+I'm happy to announce Subversion [version], available from:
+
+    http://subversion.tigris.org/downloads/subversion-[version].tar.bz2
+    http://subversion.tigris.org/downloads/subversion-[version].tar.gz
+    http://subversion.tigris.org/downloads/subversion-[version].zip
+
+The SHA1 checksums are:
+
+[sha1info]
+
+PGP Signatures are available at:
+
+    http://subversion.tigris.org/downloads/subversion-[version].tar.bz2.asc
+    http://subversion.tigris.org/downloads/subversion-[version].tar.gz.asc
+    http://subversion.tigris.org/downloads/subversion-[version].zip.asc
+
+For this release, the following people have provided PGP signatures:
+
+[siginfo]
+
+Release notes for the [major-minor].x release series may be found at:
+
+    http://subversion.apache.org/docs/release-notes/[major-minor].html
+
+You can find the list of changes between [version] and earlier versions at:
+
+    http://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES
+
+Questions, comments, and bug reports to [email protected].
+
+Thanks,
+- The Subversion Team


Reply via email to