From 393d48be670f8dcb42071836776812b29a184e0f Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Tue, 11 Feb 2014 03:50:16 +0300 Subject: Update copyright years for 2014 --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 3f4d703..2445af1 100644 --- a/SConstruct +++ b/SConstruct @@ -5,7 +5,7 @@ # 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' -- cgit v0.12 From c5f2413c98c3ac4804c4430586d56ffa361414fd Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Tue, 25 Feb 2014 08:13:41 +0300 Subject: Make test/option-v.py independent onf specific copyright years. --- test/option-v.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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. -- cgit v0.12 From 67a955e55c907bcd5b37710be2ae1fbf022b0ece Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Tue, 25 Feb 2014 08:27:16 +0300 Subject: Make test/Interactive/version.py independent of specific copyright years --- test/Interactive/version.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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>>> -- cgit v0.12 From d195102ae754743efa7578149244f82e70d089b0 Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Tue, 25 Feb 2014 08:36:17 +0300 Subject: No need to update copyright_years in QMTest/TestSCons.py anymore --- QMTest/TestSCons.py | 2 -- SConstruct | 2 -- 2 files changed, 4 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) diff --git a/SConstruct b/SConstruct index 2445af1..9dc599e 100644 --- a/SConstruct +++ b/SConstruct @@ -3,8 +3,6 @@ # # 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-2014' # This gets inserted into the man pages to reflect the month of release. -- cgit v0.12