diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-08-05 21:32:08 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-08-05 21:32:08 (GMT) |
| commit | 547595c54e9ef1041f72613326f8efae6afa017c (patch) | |
| tree | 164ddda2996d34bc25e1ec84ef1b9b466121e2f0 | |
| parent | 305b50ccfe2c1158e26a3a334e3f6dae0dd7f63f (diff) | |
| download | SCons-547595c54e9ef1041f72613326f8efae6afa017c.zip SCons-547595c54e9ef1041f72613326f8efae6afa017c.tar.gz SCons-547595c54e9ef1041f72613326f8efae6afa017c.tar.bz2 | |
New upload-release-files script, and fixed up update-release-info.
update-release-info: allow regular 3-digit releases (not .final.0)
upload-release-files: new, does a lot of the heavy lifting for a release.
| -rw-r--r-- | bin/update-release-info.py | 7 | ||||
| -rwxr-xr-x | bin/upload-release-files.sh | 27 |
2 files changed, 30 insertions, 4 deletions
diff --git a/bin/update-release-info.py b/bin/update-release-info.py index 15a35b7..4493911 100644 --- a/bin/update-release-info.py +++ b/bin/update-release-info.py @@ -108,14 +108,17 @@ if DEBUG: print 'release date', release_date if mode == 'develop' and version_tuple[3] != 'alpha': version_tuple == version_tuple[:3] + ('alpha', 0) -if version_tuple[3] != 'final': +if len(version_tuple) > 3 and version_tuple[3] != 'final': if mode == 'develop': version_tuple = version_tuple[:4] + ('yyyymmdd',) else: yyyy,mm,dd,_,_,_ = release_date version_tuple = version_tuple[:4] + ((yyyy*100 + mm)*100 + dd,) version_string = '.'.join(map(str, version_tuple)) -version_type = version_tuple[3] +if len(version_tuple) > 3: + version_type = version_tuple[3] +else: + version_type = 'final' if DEBUG: print 'version string', version_string if version_type not in ['alpha', 'beta', 'candidate', 'final']: diff --git a/bin/upload-release-files.sh b/bin/upload-release-files.sh index 17eb71b..2ba10cc 100755 --- a/bin/upload-release-files.sh +++ b/bin/upload-release-files.sh @@ -44,8 +44,31 @@ $RSYNC $RSYNCOPTS \ $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons-src/$VERSION/ -# Doc doesn't go to SF, but to scons.org. +# +# scons.org stuff: +# +# Doc: copy the doc tgz over; we'll unpack later $RSYNC $RSYNCOPTS \ scons-doc-$VERSION.tar.gz \ scons@scons.org:public_html/production/doc/$VERSION/ - +# Copy the changelog +$RSYNC $RSYNCOPTS \ + CHANGES.txt \ + scons@scons.org:public_html/production/ +# Note that Announce.txt gets copied over to RELEASE.txt. +# This should be fixed at some point. +$RSYNC $RSYNCOPTS \ + Announce.txt \ + scons@scons.org:public_html/production/RELEASE.txt +# Unpack the doc and repoint doc symlinks: +ssh scons@scons.org " + cd public_html/production/doc + cd $VERSION + tar xvf scons-doc-$VERSION.tar.gz + cd .. + rm latest; ln -s $VERSION latest + rm production; ln -s $VERSION production +" +echo '*****' +echo '***** Now manually update index.php, includes/versions.php and news-raw.xhtml on scons.org.' +echo '*****' |