diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-04 22:38:47 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-04 22:38:47 (GMT) |
| commit | 1a40dd7214e1e243ade7796de7eeb5a8ab97437d (patch) | |
| tree | a9735d83a13fcc3296634646c7c099d6429c0548 | |
| parent | d53067ce68e14f2d39a62e342a86d2881154b8e3 (diff) | |
| download | SCons-1a40dd7214e1e243ade7796de7eeb5a8ab97437d.zip SCons-1a40dd7214e1e243ade7796de7eeb5a8ab97437d.tar.gz SCons-1a40dd7214e1e243ade7796de7eeb5a8ab97437d.tar.bz2 | |
Put back into develop mode post-2.3.1 release;
also improve update-release-info.py to use shorter copyright year strings.
| -rw-r--r-- | ReleaseConfig | 2 | ||||
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | bin/update-release-info.py | 4 | ||||
| -rw-r--r-- | doc/user/main.xml | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/ReleaseConfig b/ReleaseConfig index 2beab02..6da53b1 100644 --- a/ReleaseConfig +++ b/ReleaseConfig @@ -51,7 +51,7 @@ deprecated_python_version = (2, 7, 0) #month_year = 'December 2012' # If copyright years is not given, the release year is used as the end. -#copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012' +copyright_years = '2001 - 2014' # Local Variables: # tab-width:4 @@ -3,7 +3,7 @@ # # See the README.rst file for an overview of how SCons is built and tested. -copyright_years = '2001-2014' +copyright_years = '2001 - 2014' # This gets inserted into the man pages to reflect the month of release. month_year = 'MONTH YEAR' diff --git a/bin/update-release-info.py b/bin/update-release-info.py index 14894a4..59b3e84 100644 --- a/bin/update-release-info.py +++ b/bin/update-release-info.py @@ -138,7 +138,7 @@ if DEBUG: print 'month year', month_year try: copyright_years = config['copyright_years'] except KeyError: - copyright_years = ', '.join(map(str, list(range(2001, release_date[0] + 1)))) + copyright_years = '2001 - %d'%(release_date[0] + 1) if DEBUG: print 'copyright years', copyright_years class UpdateFile(object): @@ -332,7 +332,7 @@ t.replace_assign('deprecated_python_version', str(deprecated_version)) # Update doc/user/main.{in,xml} -docyears = ', '.join(map(str, iter(range(2004, release_date[0] + 1)))) +docyears = '2004 - %d' % release_date[0] if os.path.exists(os.path.join('doc', 'user', 'main.in')): # this is no longer used as of Dec 2013 t = UpdateFile(os.path.join('doc', 'user', 'main.in')) diff --git a/doc/user/main.xml b/doc/user/main.xml index 60dd8c9..c645ff4 100644 --- a/doc/user/main.xml +++ b/doc/user/main.xml @@ -74,15 +74,15 @@ <corpauthor>Steven Knight</corpauthor> - <pubdate>2004, 2005, 2006, 2007, 2008, 2009, 2010</pubdate> + <pubdate>2004 - 2014</pubdate> <copyright> - <year>2004, 2005, 2006, 2007, 2008, 2009, 2010</year> - <holder>Steven Knight</holder> + <year>2004 - 2014</year> + <holder>The SCons Foundation</holder> </copyright> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="copyright.xml"/> - + <releaseinfo>version &buildversion;</releaseinfo> <mediaobject role="cover"><imageobject><imagedata fileref="cover.jpg" format="JPG"/></imageobject></mediaobject> @@ -96,7 +96,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nodes.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="depends.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="environments.xml"/> - + <chapter id="chap-manip-options"> <title>Automatically Putting Command-line Options into their Construction Variables</title> <!-- TODO: This intro paragraph should describe at a high-level |