diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/SConsDoc.py | 6 | ||||
| -rw-r--r-- | bin/import-test.py | 4 | ||||
| -rw-r--r-- | bin/linecount.py | 4 | ||||
| -rw-r--r-- | bin/restore.sh | 24 | ||||
| -rw-r--r-- | bin/update-release-info.py | 8 | ||||
| -rwxr-xr-x | bin/upload-release-files.sh | 4 |
6 files changed, 25 insertions, 25 deletions
diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py index d0575b0..b42e994 100644 --- a/bin/SConsDoc.py +++ b/bin/SConsDoc.py @@ -169,7 +169,7 @@ xsi = "http://www.w3.org/2001/XMLSchema-instance" # Header comment with copyright copyright_comment = """ -Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation +Copyright (c) 2001 - 2014 The SCons Foundation This file is processed by the bin/SConsDoc.py module. See its __doc__ string for a discussion of the format. @@ -315,7 +315,7 @@ if not has_libxml2: fout.close() def decorateWithHeader(self, root): - root.attrib["{"+xsi+"}schemaLocation"] = "%s/scons.xsd scons.xsd" % dbxsd + root.attrib["{"+xsi+"}schemaLocation"] = "%s %s/scons.xsd" % (dbxsd, dbxsd) return root def newXmlTree(self, root): @@ -450,7 +450,7 @@ else: xi = root.newNs(xsi, 'xsi') root.setNs(ns) #put this node in the target namespace - root.setNsProp(xi, 'schemaLocation', "%s/scons.xsd scons.xsd" % dbxsd) + root.setNsProp(xi, 'schemaLocation', "%s %s/scons.xsd" % (dbxsd, dbxsd)) return root diff --git a/bin/import-test.py b/bin/import-test.py index ccec096..b58486f 100644 --- a/bin/import-test.py +++ b/bin/import-test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation +# Copyright (c) 2001 - 2014 The SCons Foundation # # tree2test.py - turn a directory tree into TestSCons code # @@ -25,7 +25,7 @@ # """ triple-quotes will need to have their contents edited by hand. # -__revision__ = "bin/import-test.py 2014/03/02 14:18:15 garyo" +__revision__ = "bin/import-test.py 2014/07/05 09:42:21 garyo" import os.path import sys diff --git a/bin/linecount.py b/bin/linecount.py index 9088529..b9778af 100644 --- a/bin/linecount.py +++ b/bin/linecount.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation +# Copyright (c) 2001 - 2014 The SCons Foundation # # Count statistics about SCons test and source files. This must be run # against a fully-populated tree (for example, one that's been freshly @@ -23,7 +23,7 @@ # interesting one for most purposes. from __future__ import division -__revision__ = "bin/linecount.py 2014/03/02 14:18:15 garyo" +__revision__ = "bin/linecount.py 2014/07/05 09:42:21 garyo" import os.path diff --git a/bin/restore.sh b/bin/restore.sh index df296a4..d9113ae 100644 --- a/bin/restore.sh +++ b/bin/restore.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # -# Simple hack script to restore __revision__, __COPYRIGHT_, 2.3.1 +# Simple hack script to restore __revision__, __COPYRIGHT_, 2.3.2 # and other similar variables to what gets checked in to source. This # comes in handy when people send in diffs based on the released source. # @@ -22,9 +22,9 @@ header() { for i in `find $DIRS -name '*.py'`; do header $i ed $i <<EOF -g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation/p +g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2014 The SCons Foundation/p w -/^__revision__ = /s/= .*/= "bin/restore.sh 2014/03/02 14:18:15 garyo"/p +/^__revision__ = /s/= .*/= "bin/restore.sh 2014/07/05 09:42:21 garyo"/p w q EOF @@ -33,9 +33,9 @@ done for i in `find $DIRS -name 'scons.bat'`; do header $i ed $i <<EOF -g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation/p +g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2014 The SCons Foundation/p w -/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh 2014/03/02 14:18:15 garyo/p +/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh 2014/07/05 09:42:21 garyo/p w q EOF @@ -44,13 +44,13 @@ done for i in `find $DIRS -name '__init__.py' -o -name 'scons.py' -o -name 'sconsign.py'`; do header $i ed $i <<EOF -/^__version__ = /s/= .*/= "2.3.1"/p +/^__version__ = /s/= .*/= "2.3.2"/p w /^__build__ = /s/= .*/= ""/p w /^__buildsys__ = /s/= .*/= "lubuntu"/p w -/^__date__ = /s/= .*/= "2014/03/02 14:18:15"/p +/^__date__ = /s/= .*/= "2014/07/05 09:42:21"/p w /^__developer__ = /s/= .*/= "garyo"/p w @@ -61,7 +61,7 @@ done for i in `find $DIRS -name 'setup.py'`; do header $i ed $i <<EOF -/^ *version = /s/= .*/= "2.3.1",/p +/^ *version = /s/= .*/= "2.3.2",/p w q EOF @@ -70,11 +70,11 @@ done for i in `find $DIRS -name '*.txt'`; do header $i ed $i <<EOF -g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation/p +g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2014 The SCons Foundation/p w -/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh 2014/03/02 14:18:15 garyo/p +/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh 2014/07/05 09:42:21 garyo/p w -/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.3.1/p +/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.3.2/p w q EOF @@ -83,7 +83,7 @@ done for i in `find $DIRS -name '*.xml'`; do header $i ed $i <<EOF -g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation/p +g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2014 The SCons Foundation/p w q EOF diff --git a/bin/update-release-info.py b/bin/update-release-info.py index b8c50bd..3b98c48 100644 --- a/bin/update-release-info.py +++ b/bin/update-release-info.py @@ -36,7 +36,7 @@ In 'post' mode, files are prepared for the next release cycle: src/Announce.txt. """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation +# Copyright (c) 2001 - 2014 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -57,7 +57,7 @@ In 'post' mode, files are prepared for the next release cycle: # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "bin/update-release-info.py 2014/03/02 14:18:15 garyo" +__revision__ = "bin/update-release-info.py 2014/07/05 09:42:21 garyo" import os import sys @@ -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/bin/upload-release-files.sh b/bin/upload-release-files.sh index 2867e3c..bf09751 100755 --- a/bin/upload-release-files.sh +++ b/bin/upload-release-files.sh @@ -46,7 +46,7 @@ $RSYNC $RSYNCOPTS \ # # scons.org stuff: -# +# # Doc: copy the doc tgz over; we'll unpack later $RSYNC $RSYNCOPTS \ scons-doc-$VERSION.tar.gz \ @@ -68,7 +68,7 @@ ssh scons@scons.org " cd .. rm latest; ln -s $VERSION latest rm production; ln -s $VERSION production - for f in HTML PDF PS TEXT; do rm $f; ln -s $VERSION/$f $f; done + for f in HTML PDF EPUB PS TEXT; do rm \$f; ln -s $VERSION/\$f \$f; done " echo '*****' echo '***** Now manually update index.php, includes/versions.php and news-raw.xhtml on scons.org.' |