diff options
author | Steven Knight <knight@baldmt.com> | 2010-05-31 15:19:55 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2010-05-31 15:19:55 (GMT) |
commit | a4fd56c56bf0457d52280541a70c22103619f7c6 (patch) | |
tree | 3ec019766a95c2ca7c71288cf653f444ac4d1cf2 /SConstruct | |
parent | 5effedce50e7b5ace6c8b9c5a3d33f44435819fd (diff) | |
download | SCons-a4fd56c56bf0457d52280541a70c22103619f7c6.zip SCons-a4fd56c56bf0457d52280541a70c22103619f7c6.tar.gz SCons-a4fd56c56bf0457d52280541a70c22103619f7c6.tar.bz2 |
Merged revisions 4838-4911,4913-4914,4916-4917,4919-4924,4926-4927,4929-4936 via svnmerge from
http://scons.tigris.org/svn/scons/checkpoint/trunk
........
r4914 | bdbaddog | 2010-05-24 23:07:53 -0700 (Mon, 24 May 2010) | 3 lines
Updated version strings and date string for checkpoint
........
r4926 | stevenknight | 2010-05-29 22:57:09 -0700 (Sat, 29 May 2010) | 2 lines
Update CHANGES.txt for checkpoint release.
........
r4929 | stevenknight | 2010-05-30 08:58:54 -0700 (Sun, 30 May 2010) | 2 lines
Generate a .beta., not .alpha.
........
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -157,7 +157,7 @@ if checkpoint: checkpoint = time.strftime('%Y%m%d', time.localtime(time.time())) elif checkpoint == 'r': checkpoint = 'r' + revision - version = version + '.alpha.' + checkpoint + version = version + '.beta.' + checkpoint build_id = ARGUMENTS.get('BUILD_ID') if build_id is None: |