diff options
| author | William Deegan <bill@baddogconsulting.com> | 2010-05-09 21:45:03 +0000 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2010-05-09 21:45:03 +0000 |
| commit | 03be8d4c4e101c18561486fc31f21aefffe42f4b (patch) | |
| tree | 0b0a777fca857101844806a41e7e29b7137d8cc7 /SConstruct | |
| parent | 4ed1286615fbbe803ec4b228239436e3305ef2d4 (diff) | |
| download | scons-git-03be8d4c4e101c18561486fc31f21aefffe42f4b.tar.gz | |
Merged revisions 4832,4834-4836 via svnmerge from
http://scons.tigris.org/svn/scons/checkpoint/trunk
........
r4832 | bdbaddog | 2010-05-03 23:00:21 -0700 (Mon, 03 May 2010) | 3 lines
Updated RELEASE.txt from Greg Noel
........
r4834 | bdbaddog | 2010-05-03 23:34:14 -0700 (Mon, 03 May 2010) | 3 lines
Updates for 2.0.0.alpha.20100503 checkpoint release
........
r4835 | bdbaddog | 2010-05-08 14:27:43 -0700 (Sat, 08 May 2010) | 3 lines
Change test to check for version 3.0 and expect failure, since we're now working on a 2.0 checkpoint.
........
r4836 | bdbaddog | 2010-05-08 14:31:58 -0700 (Sat, 08 May 2010) | 3 lines
Update build date. Fix checkpoint build version string to remove the .dYYYYMMDD and change to .YYYYMMDD
........
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 32178fbc3..25f1ed41e 100644 --- a/SConstruct +++ b/SConstruct @@ -8,7 +8,7 @@ copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010' # This gets inserted into the man pages to reflect the month of release. -month_year = 'January 2010' +month_year = 'May 2010' # # __COPYRIGHT__ @@ -43,7 +43,7 @@ import sys import tempfile project = 'scons' -default_version = '1.3.0' +default_version = '2.0.0' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years platform = distutils.util.get_platform() @@ -154,10 +154,10 @@ checkpoint = ARGUMENTS.get('CHECKPOINT', '') if checkpoint: if checkpoint == 'd': import time - checkpoint = time.strftime('d%Y%m%d', time.localtime(time.time())) + checkpoint = time.strftime('%Y%m%d', time.localtime(time.time())) elif checkpoint == 'r': checkpoint = 'r' + revision - version = version + '.' + checkpoint + version = version + '.alpha.' + checkpoint build_id = ARGUMENTS.get('BUILD_ID') if build_id is None: |