Commits

Gary Oberbrunner committed d8fc6f7 Merge

Merged in techtonik/scons (pull request #108), update copyrights to 2014

Comments (0)

Files changed (4)

QMTest/TestSCons.py

 
 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)
 
 #
 # 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'

test/Interactive/version.py

 
 
 
-# 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>>> 
 
 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.