Commits

Gary Oberbrunner committed f973bc8

Put back into develop mode post-2.3.1 release;

also improve update-release-info.py to use shorter copyright year strings.

  • Participants
  • Parent commits 6b54eed

Comments (0)

Files changed (4)

File ReleaseConfig

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

File bin/update-release-info.py

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

File doc/user/main.xml

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