summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/import-test.py4
-rw-r--r--bin/linecount.py4
-rw-r--r--bin/restore.sh30
-rw-r--r--bin/scons-doc.py2
-rw-r--r--bin/scons-proc.py4
-rw-r--r--bin/update-release-info.py23
6 files changed, 29 insertions, 38 deletions
diff --git a/bin/import-test.py b/bin/import-test.py
index cb95ff2..014d0f3 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 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 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 5357 2011/09/09 21:31:03 bdeegan"
+__revision__ = "bin/import-test.py issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
import os.path
import sys
diff --git a/bin/linecount.py b/bin/linecount.py
index 7121ebd..26b7b77 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 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 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 5357 2011/09/09 21:31:03 bdeegan"
+__revision__ = "bin/linecount.py issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
import os.path
diff --git a/bin/restore.sh b/bin/restore.sh
index 3aab7ae..2efb22e 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.1.0
+# Simple hack script to restore __revision__, __COPYRIGHT_, 2.2.0
# 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 The SCons Foundation/p
+g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation/p
w
-/^__revision__ = /s/= .*/= "bin/restore.sh 5357 2011/09/09 21:31:03 bdeegan"/p
+/^__revision__ = /s/= .*/= "bin/restore.sh issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 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 The SCons Foundation/p
+g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation/p
w
-/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh 5357 2011/09/09 21:31:03 bdeegan/p
+/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo/p
w
q
EOF
@@ -44,15 +44,15 @@ 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.1.0"/p
+/^__version__ = /s/= .*/= "2.2.0"/p
w
-/^__build__ = /s/= .*/= "r5357[MODIFIED]"/p
+/^__build__ = /s/= .*/= "issue-2856:2676:d23b7a2f45e8[MODIFIED]"/p
w
-/^__buildsys__ = /s/= .*/= "ubuntu"/p
+/^__buildsys__ = /s/= .*/= "oberbrunner-dev"/p
w
-/^__date__ = /s/= .*/= "2011/09/09 21:31:03"/p
+/^__date__ = /s/= .*/= "2012/08/05 15:38:28"/p
w
-/^__developer__ = /s/= .*/= "bdeegan"/p
+/^__developer__ = /s/= .*/= "garyo"/p
w
q
EOF
@@ -61,7 +61,7 @@ done
for i in `find $DIRS -name 'setup.py'`; do
header $i
ed $i <<EOF
-/^ *version = /s/= .*/= "2.1.0",/p
+/^ *version = /s/= .*/= "2.2.0",/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 The SCons Foundation/p
+g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation/p
w
-/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh 5357 2011/09/09 21:31:03 bdeegan/p
+/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo/p
w
-/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.1.0/p
+/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.2.0/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 The SCons Foundation/p
+g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation/p
w
q
EOF
diff --git a/bin/scons-doc.py b/bin/scons-doc.py
index f99dfa7..cf5d5b2 100644
--- a/bin/scons-doc.py
+++ b/bin/scons-doc.py
@@ -845,7 +845,7 @@ def process(filename, fout=sys.stdout):
if data.startswith('<?xml '):
first_line, data = data.split('\n', 1)
- sys.stdout.write(first_line + '\n')
+ fout.write(first_line + '\n')
x = MySGML(fout)
for c in data:
diff --git a/bin/scons-proc.py b/bin/scons-proc.py
index 6d15816..1f537c7 100644
--- a/bin/scons-proc.py
+++ b/bin/scons-proc.py
@@ -17,7 +17,7 @@ import string
import sys
import xml.sax
try:
- from io import StringIO
+ from io import StringIO # usable as of 2.6; takes unicode only
except ImportError:
# No 'io' module or no StringIO in io
exec('from cStringIO import StringIO')
@@ -105,7 +105,7 @@ for f in args:
content = content.replace('-->\n', '-->')
input = xml_preamble + content + xml_postamble
try:
- saxparser.parse(StringIO(input))
+ saxparser.parse(StringIO(unicode(input)))
except:
sys.stderr.write("error in %s\n" % f)
raise
diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index 1c84466..cc4fa4e 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 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 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 5357 2011/09/09 21:31:03 bdeegan"
+__revision__ = "bin/update-release-info.py issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
import os
import sys
@@ -108,24 +108,17 @@ if DEBUG: print 'release date', release_date
if mode == 'develop' and version_tuple[3] != 'alpha':
version_tuple == version_tuple[:3] + ('alpha', 0)
-if version_tuple[3] != 'final':
+if len(version_tuple) > 3 and version_tuple[3] != 'final':
if mode == 'develop':
version_tuple = version_tuple[:4] + ('yyyymmdd',)
else:
yyyy,mm,dd,_,_,_ = release_date
version_tuple = version_tuple[:4] + ((yyyy*100 + mm)*100 + dd,)
-
-import pdb
-pdb.set_trace()
-
-if mode == 'final' or mode == 'release':
- version_string = '.'.join(map(str, version_tuple[0:3]))
+version_string = '.'.join(map(str, version_tuple))
+if len(version_tuple) > 3:
+ version_type = version_tuple[3]
else:
- version_string = '.'.join(map(str, version_tuple))
-
-version_type = version_tuple[3]
-
-
+ version_type = 'final'
if DEBUG: print 'version string', version_string
if version_type not in ['alpha', 'beta', 'candidate', 'final']:
@@ -194,9 +187,7 @@ class UpdateFile(object):
'''
XXX
'''
- if DEBUG: print "content before:%s"%self.content
self.content = self.match_rel.sub(replacement, self.content, count)
- if DEBUG: print "content after :%s"%self.content
# Determine the release date and the pattern to match a date
# Mon, 05 Jun 2010 21:17:15 -0700
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 14:28:54 +0000