svn commit: r1595936 - in /subversion/trunk/tools/dist: release.py templates/rc-release-ann.ezt templates/stable-release-ann.ezt

[br...@apache.org]

Author: breser
Date: Mon May 19 15:50:17 2014
New Revision: 1595936

URL: http://svn.apache.org/r1595936
Log:
Fix release.py write-announcement to be aware of the anchor.

I've made a long string of releases with the wrong anchor for 1.7.x.
This isn't perfect since we have to remember to bump the version before
using the tool when making a new minor, but it help reduce the problem.

* tools/dist/release.py
  (recommended_release): New variable to keep track of our recommended line.
  (write_announcement): Set the tags based on the version number and avoid
    calculating the major/minor string twice.

* tools/dist/templates/rc-release-ann.ezt
  tools/dist/templates/stable-release-ann.ezt: Use anchor data instead of hard
    coded anchor values.

Modified:
    subversion/trunk/tools/dist/release.py
    subversion/trunk/tools/dist/templates/rc-release-ann.ezt
    subversion/trunk/tools/dist/templates/stable-release-ann.ezt

Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1595936&r1=1595935&r2=1595936&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Mon May 19 15:50:17 2014
@@ -111,6 +111,9 @@ tool_versions = {
   },
 }
 
+# The version that is our current recommended release
+recommended_release = '1.8'
+
 # Some constants
 repos = 'http://svn.apache.org/repos/asf/subversion'
 secure_repos = 'https://svn.apache.org/repos/asf/subversion'
@@ -714,19 +717,24 @@ def write_announcement(args):
     'Write the release announcement.'
     sha1info = get_sha1info(args)
     siginfo = "\n".join(get_siginfo(args, True)) + "\n"
+    major_minor = '%d.%d' % (args.version.major, args.version.minor)
 
     data = { 'version'              : str(args.version),
              'sha1info'             : sha1info,
              'siginfo'              : siginfo,
-             'major-minor'          : '%d.%d' % (args.version.major,
-                                                 args.version.minor),
+             'major-minor'          : major_minor,
              'major-minor-patch'    : args.version.base,
            }
 
     if args.version.is_prerelease():
         template_filename = 'rc-release-ann.ezt'
+        data['anchor'] = 'pre-releases'
     else:
         template_filename = 'stable-release-ann.ezt'
+        if major_minor == recommended_release:
+            data['anchor'] = 'recommended-release'
+        else:
+            data['anchor'] = 'supported-releases'
 
     template = ezt.Template(compress_whitespace = False)
     template.parse(get_tmplfile(template_filename).read())

Modified: subversion/trunk/tools/dist/templates/rc-release-ann.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/templates/rc-release-ann.ezt?rev=1595936&r1=1595935&r2=1595936&view=diff
==============================================================================
--- subversion/trunk/tools/dist/templates/rc-release-ann.ezt (original)
+++ subversion/trunk/tools/dist/templates/rc-release-ann.ezt Mon May 19 15:50:17 2014
@@ -1,7 +1,7 @@
 I'm happy to announce the release of Apache Subversion [version].
 Please choose the mirror closest to you by visiting:
 
-    http://subversion.apache.org/download/#pre-releases
+    http://subversion.apache.org/download/#[anchor]
 
 The SHA1 checksums are:
 

Modified: 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=1595936&r1=1595935&r2=1595936&view=diff
==============================================================================
--- subversion/trunk/tools/dist/templates/stable-release-ann.ezt (original)
+++ subversion/trunk/tools/dist/templates/stable-release-ann.ezt Mon May 19 15:50:17 2014
@@ -1,7 +1,7 @@
 I'm happy to announce the release of Apache Subversion [version].
 Please choose the mirror closest to you by visiting:
 
-    http://subversion.apache.org/download/#recommended-release
+    http://subversion.apache.org/download/#[anchor]
 
 The SHA1 checksums are: