diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-01 23:05:19 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-01 23:05:19 (GMT) |
| commit | 9f48ff3d0e3decef0ee6a2fe02194ec367094401 (patch) | |
| tree | e6ac75005b7db1b3f477b3db362fc964e3b429c1 | |
| parent | 2990e8015515e764c786c819fc7ccef18f77a8e2 (diff) | |
| parent | d195102ae754743efa7578149244f82e70d089b0 (diff) | |
| download | SCons-9f48ff3d0e3decef0ee6a2fe02194ec367094401.zip SCons-9f48ff3d0e3decef0ee6a2fe02194ec367094401.tar.gz SCons-9f48ff3d0e3decef0ee6a2fe02194ec367094401.tar.bz2 | |
Merged in techtonik/scons (pull request #108), update copyrights to 2014
| -rw-r--r-- | QMTest/TestSCons.py | 2 | ||||
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | test/Interactive/version.py | 12 | ||||
| -rw-r--r-- | test/option-v.py | 10 |
4 files changed, 9 insertions, 19 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index ffba4c1..57b97f9 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -36,8 +36,6 @@ from TestCmd import PIPE default_version = '2.3.1.alpha.yyyymmdd' -copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013' - python_version_unsupported = (2, 3, 0) python_version_deprecated = (2, 7, 0) @@ -3,9 +3,7 @@ # # See the README.rst file for an overview of how SCons is built and tested. -# 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, 2009, 2010, 2011, 2012, 2013' +copyright_years = '2001-2014' # This gets inserted into the man pages to reflect the month of release. month_year = 'MONTH YEAR' diff --git a/test/Interactive/version.py b/test/Interactive/version.py index bbca9ef..96ce51e 100644 --- a/test/Interactive/version.py +++ b/test/Interactive/version.py @@ -36,15 +36,11 @@ test.write('SConstruct', "") -# Construct the standard copyright marker so it doesn't get replaced +# Standard copyright marker is mangled so it doesn't get replaced # by the packaging build. -copyright_marker = '__' + 'COPYRIGHT' + '__' - -fmt = '(%s|Copyright \\(c\\) %s The SCons Foundation)\n' - -copyright_line = fmt % (copyright_marker, TestSCons.copyright_years) - - +copyright_line = """\ +(_{2}COPYRIGHT__|Copyright \\(c\\) 2001[-\d, ]+ The SCons Foundation) +""" expect1 = """\ scons>>> diff --git a/test/option-v.py b/test/option-v.py index 680f541..f3eb61c 100644 --- a/test/option-v.py +++ b/test/option-v.py @@ -31,13 +31,11 @@ test = TestSCons.TestSCons(match = TestCmd.match_re) test.write('SConstruct', "") -# Construct the standard copyright marker so it doesn't get replaced +# Standard copyright marker is mangled so it doesn't get replaced # by the packaging build. -copyright_marker = '__' + 'COPYRIGHT' + '__' - -fmt = '(%s|Copyright \\(c\\) %s The SCons Foundation)\n' - -copyright_line = fmt % (copyright_marker, TestSCons.copyright_years) +copyright_line = """\ +(_{2}COPYRIGHT__|Copyright \\(c\\) 2001[-\d, ]+ The SCons Foundation) +""" # Windows may or may not print a line for the script version # depending on whether it's invoked through scons.py or scons.bat. |