summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2010-06-06 04:36:43 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2010-06-06 04:36:43 (GMT)
commitc5fc97b3bfb45c30decec6516be3e1c4c3b824c7 (patch)
tree1f9514675840e3dbc024885be582ace418ad840d
parent823f2cda1252dcd89835d6ff2af55b4a4be74ce4 (diff)
downloadSCons-c5fc97b3bfb45c30decec6516be3e1c4c3b824c7.zip
SCons-c5fc97b3bfb45c30decec6516be3e1c4c3b824c7.tar.gz
SCons-c5fc97b3bfb45c30decec6516be3e1c4c3b824c7.tar.bz2
Merged revisions 4964 via svnmerge from
http://scons.tigris.org/svn/scons/checkpoint/trunk ........ r4964 | bdbaddog | 2010-06-05 21:09:54 -0700 (Sat, 05 Jun 2010) | 3 lines Changes for 2.0.0.beta.20100605 checkpoint release. ........
-rw-r--r--SConstruct2
-rw-r--r--src/CHANGES.txt9
-rw-r--r--src/RELEASE.txt2
3 files changed, 10 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index 4478a5e..68cc271 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 = 'May 2010'
+month_year = 'June 2010'
#
# __COPYRIGHT__
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 6f74566..b6aca97 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -7,7 +7,7 @@
Change Log
-RELEASE 2.0.0.beta.20100531 - Mon, 31 May 2010 22:15:00 -0700
+RELEASE 2.0.0.beta.20100605 - Sat, 05 Jun 2010 21:02:48 -0700
From Dirk Baechle:
@@ -44,6 +44,9 @@ RELEASE 2.0.0.beta.20100531 - Mon, 31 May 2010 22:15:00 -0700
- Fix "Ignoring corrupt sconsign entry" warnings when building
in a tree with a pre-2.0 .sconsign file.
+ - Fix propagation from environment of VS*COMNTOOLS to resolve issues
+ initializing MSVC/MSVS/SDK issues.
+
From Greg Noel:
- Apply numerous Python fixers to update code to more modern idioms.
@@ -84,6 +87,10 @@ RELEASE 2.0.0.beta.20100531 - Mon, 31 May 2010 22:15:00 -0700
- Document the AllowSubstExceptions() function in the User's Guide.
+ From William Deegan:
+
+ - Migrate MSVC/MSVS/SDK improvements from 1.3 branch.
+
RELEASE 1.3.0 - Tue, 23 Mar 2010 21:44:19 -0400
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index cf1eea1..1853b22 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,7 +1,7 @@
# __COPYRIGHT__
# __FILE__ __REVISION__ __DATE__ __DEVELOPER__
- A new SCons checkpoint release, 2.0.0.beta.20100531, is now available on
+ A new SCons checkpoint release, 2.0.0.beta.20100605, 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