Merged revisions 3848-3890,3892-3896,3898-3908 via svnmerge from

http://scons.tigris.org/svn/scons/checkpoint

........
  r3892 | stevenknight | 2009-01-12 06:02:05 -0800 (Mon, 12 Jan 2009) | 2 lines

  Updates for 1.2.0.d20090112 checkpoint release.
........
  r3893 | stevenknight | 2009-01-12 06:07:35 -0800 (Mon, 12 Jan 2009) | 2 lines

  Fix undefined reference in User's Guide build.
........
  r3898 | stevenknight | 2009-01-13 02:44:25 -0800 (Tue, 13 Jan 2009) | 2 lines

  Update checkpoint timestamps.
........
  r3899 | stevenknight | 2009-01-13 06:45:07 -0800 (Tue, 13 Jan 2009) | 2 lines

  Update expected Copyright year line used in tests.
........

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3909 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index a76c8b4e56f39279f2c384bacc63ce8123ccca7c..4a4941d77462c71f747ba9d0f3cead832ca6121d 100644 (file)
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -44,7 +44,7 @@ from TestCommon import __all__
 
 default_version = '1.2.0'
 
-copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008'
+copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009'
 
 # In the checked-in source, the value of SConsVersion in the following
 # line must remain "__ VERSION __" (without the spaces) so the built

diff --git a/SConstruct b/SConstruct
index 4b386299a1ef0b495d6799b3c1788d343bdf84be..0ddbf5b9e1dfee1717c01b72145fb214a4b60ef1 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -6,10 +6,10 @@
 
 # When this gets changed, you must also change the copyright_years string
 # in QMTest/TestSCons.py so the test scripts look for the right string.
-copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008'
+copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'December 2008'
+month_year = 'January 2009'
 
 #
 # __COPYRIGHT__

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 2e9b20f9d41e8057f2535edfb41d0a73521c62d8..8d1a9be0fe3c7d859d2a040b09374a1eaa71b081 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,7 +8,7 @@
 
 
 
-RELEASE 1.X - XXX
+RELEASE 1.2.0.d20090113 - Tue, 13 Jan 2009 02:50:30 -0800
 
   From Stanislav Baranov, Ted Johnson and Steven Knight:
 

diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index b845cd6ec18e983d994dc9842acdef6bc29e4c8f..3bcf998931fc25e55efa5cbc719070d6893f5679 100644 (file)
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -20,7 +20,7 @@ more effectively, please sign up for the scons-users mailing list at:
 
 
 
-RELEASE 1.2.0 - Sat, 20 Dec 2008 22:47:29 -0800
+RELEASE 1.2.0.d20090113 - Tue, 13 Jan 2009 02:50:30 -0800
 
   Please consult the CHANGES.txt file for a list of specific changes
   since last release.