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 | |
| 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.
........
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/RELEASE.txt | 4 |
3 files changed, 8 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: diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 459d280..d207279 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -41,6 +41,9 @@ RELEASE 2.0.0.beta.20100531 - Mon, 31 May 2010 22:15:00 -0700 - Convert old-style classes into new-style classes. + - Fix "Ignoring corrupt sconsign entry" warnings when building + in a tree with a pre-2.0 .sconsign file. + From Greg Noel: - Apply numerous Python fixers to update code to more modern idioms. diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 9fc23f3..abb2581 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,5 +1,9 @@ A new SCons checkpoint release, 2.0.0.beta.20100531, is now available on the SCons download page: + The primary purpose of this release is to remove support for + Python versions prior to 2.4 and streamline the SCons code base + using more modern python idioms. + The checkpoint is available at the SCons download page: http://www.scons.org/download.php |