svn commit: r1464654 - /subversion/trunk/tools/dist/release.py

[br...@apache.org]

Author: breser
Date: Thu Apr  4 17:47:09 2013
New Revision: 1464654

URL: http://svn.apache.org/r1464654
Log:
Adjust the naming of svn_version.h.dist to allow multiple releases at the same
time.

* tools/dist/release.py
  (roll_tarballs,move_to_dist): Include the version number in the
    svn_version.h.dist file, e.g. svn_version.h.dist-1.6.21
 
Patch by: danielsh
 

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=1464654&r1=1464653&r2=1464654&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Thu Apr  4 17:47:09 2013
@@ -448,7 +448,9 @@ def roll_tarballs(args):
         m.update(open(filename, 'r').read())
         open(filename + '.sha1', 'w').write(m.hexdigest())
 
-    shutil.move('svn_version.h.dist', get_deploydir(args.base_dir))
+    shutil.move('svn_version.h.dist',
+                get_deploydir(args.base_dir) + '/' + 'svn_version.h.dist'
+                + '-' + str(args.version))
 
     # And we're done!
 
@@ -593,7 +595,8 @@ def move_to_dist(args):
                    'Publish Subversion-%s.' % str(args.version)]
     if (args.username):
         svnmucc_cmd += ['--username', args.username]
-    svnmucc_cmd += ['rm', dist_dev_url + '/' + 'svn_version.h.dist']
+    svnmucc_cmd += ['rm', dist_dev_url + '/' + 'svn_version.h.dist'
+                          + '-' + str(args.version)]
     for filename in filenames:
         svnmucc_cmd += ['mv', dist_dev_url + '/' + filename,
                         dist_release_url + '/' + filename]