7 files changed, 101 insertions, 26 deletions
diff --git a/bin/calibrate.py b/bin/calibrate.py
index 72a6ac7..8ed2ece 100644
--- a/bin/calibrate.py
+++ b/bin/calibrate.py
@@ -50,7 +50,7 @@ def main(argv=None):
         if len(args) > 1:
             print arg + ':'
 
-        command = [sys.executable, 'runtest.py', '--noqmtest']
+        command = [sys.executable, 'runtest.py']
         if opts.package:
             command.extend(['-p', opts.package])
         command.append(arg)
diff --git a/bin/import-test.py b/bin/import-test.py
index 014d0f3..a565deb 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 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
+__revision__ = "bin/import-test.py  2013/03/03 09:48:35 garyo"
 
 import os.path
 import sys
diff --git a/bin/linecount.py b/bin/linecount.py
index 26b7b77..8d1fd7c 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 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
+__revision__ = "bin/linecount.py  2013/03/03 09:48:35 garyo"
 
 import os.path
 
diff --git a/bin/restore.sh b/bin/restore.sh
index 2efb22e..b2b10b1 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.2.0
+# Simple hack script to restore __revision__, __COPYRIGHT_, 2.3.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, 2012 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, 2013 The SCons Foundation/p
 w
-/^__revision__ = /s/= .*/= "bin/restore.sh issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"/p
+/^__revision__ = /s/= .*/= "bin/restore.sh  2013/03/03 09:48:35 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 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, 2013 The SCons Foundation/p
 w
-/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo/p
+/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh  2013/03/03 09:48:35 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.2.0"/p
+/^__version__ = /s/= .*/= "2.3.0"/p
 w
-/^__build__ = /s/= .*/= "issue-2856:2676:d23b7a2f45e8[MODIFIED]"/p
+/^__build__ = /s/= .*/= ""/p
 w
-/^__buildsys__ = /s/= .*/= "oberbrunner-dev"/p
+/^__buildsys__ = /s/= .*/= "reepicheep"/p
 w
-/^__date__ = /s/= .*/= "2012/08/05 15:38:28"/p
+/^__date__ = /s/= .*/= "2013/03/03 09:48:35"/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.2.0",/p
+/^ *version = /s/= .*/= "2.3.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, 2012 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, 2013 The SCons Foundation/p
 w
-/# [^ ]* 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
+/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh  2013/03/03 09:48:35 garyo/p
 w
-/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.2.0/p
+/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.3.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, 2012 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, 2013 The SCons Foundation/p
 w
 q
 EOF
diff --git a/bin/scons-test.py b/bin/scons-test.py
index 2191532..046cf4b 100644
--- a/bin/scons-test.py
+++ b/bin/scons-test.py
@@ -15,6 +15,7 @@
 # so that problems on different platforms can be identified sooner.
 #
 
+import atexit
 import getopt
 import imp
 import os
@@ -74,7 +75,7 @@ if not os.path.exists(tempdir):
         import shutil
         os.chdir(startdir)
         shutil.rmtree(tempdir)
-    sys.exitfunc = cleanup
+    atexit.register(cleanup)
 
 # Fetch the input file if it happens to be across a network somewhere.
 # Ohmigod, does Python make this simple...
diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index cc4fa4e..1b3015a 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 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
+__revision__ = "bin/update-release-info.py  2013/03/03 09:48:35 garyo"
 
 import os
 import sys
@@ -305,11 +305,10 @@ t.replace_assign('default_version', repr(version_string))
 
 # Update README
 
-t = UpdateFile('README')
-if DEBUG: t.file = '/tmp/README'
+t = UpdateFile('README.rst')
+if DEBUG: t.file = '/tmp/README.rst'
 t.sub('-' + t.match_pat + '\.', '-' + version_string + '.', count = 0)
-# the loop below can be removed after all 1.x.y releases are dead
-for suf in ['tar', 'win32', 'zip']:
+for suf in ['tar', 'win32', 'zip', 'rpm', 'exe', 'deb']:
     t.sub('-(\d+\.\d+\.\d+)\.%s' % suf,
           '-%s.%s' % (version_string, suf),
           count = 0)
diff --git a/bin/upload-release-files.sh b/bin/upload-release-files.sh
new file mode 100755
index 0000000..2867e3c
--- /dev/null
+++ b/bin/upload-release-files.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+if [ $# -lt 2 ]; then
+	echo Usage: $0 VERSION SF_USERNAME
+	exit 1
+fi
+
+VERSION=$1; shift
+SF_USER=$1; shift
+
+RSYNC='rsync'
+RSYNCOPTS='-v -e ssh'
+SF_MACHINE='frs.sourceforge.net'
+SF_TOPDIR='/home/frs/project/scons'
+
+# the build products are here:
+cd build/dist
+cp -f ../../src/CHANGES.txt ../../src/RELEASE.txt ../../src/Announce.txt .
+
+set -x
+
+# Upload main scons release files:
+$RSYNC $RSYNCOPTS \
+  scons-$VERSION-1.noarch.rpm \
+  scons-$VERSION-1.src.rpm \
+  scons-$VERSION-setup.exe \
+  scons-$VERSION.tar.gz \
+  scons-$VERSION.zip \
+  Announce.txt CHANGES.txt RELEASE.txt \
+  $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons/$VERSION/
+
+# Local packages:
+$RSYNC $RSYNCOPTS \
+  scons-local-$VERSION.tar.gz \
+  scons-local-$VERSION.zip \
+  Announce.txt CHANGES.txt RELEASE.txt \
+  $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons-local/$VERSION/
+
+# Source packages:
+$RSYNC $RSYNCOPTS \
+  scons-src-$VERSION.tar.gz \
+  scons-src-$VERSION.zip \
+  Announce.txt CHANGES.txt RELEASE.txt \
+  $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons-src/$VERSION/
+
+
+#
+# scons.org stuff:
+# 
+# Doc: copy the doc tgz over; we'll unpack later
+$RSYNC $RSYNCOPTS \
+  scons-doc-$VERSION.tar.gz \
+  scons@scons.org:public_html/production/doc/$VERSION/
+# Copy the changelog
+$RSYNC $RSYNCOPTS \
+  CHANGES.txt \
+  scons@scons.org:public_html/production/
+# Note that Announce.txt gets copied over to RELEASE.txt.
+# This should be fixed at some point.
+$RSYNC $RSYNCOPTS \
+  Announce.txt \
+  scons@scons.org:public_html/production/RELEASE.txt
+# Unpack the doc and repoint doc symlinks:
+ssh scons@scons.org "
+  cd public_html/production/doc
+  cd $VERSION
+  tar xvf scons-doc-$VERSION.tar.gz
+  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
+"
+echo '*****'
+echo '***** Now manually update index.php, includes/versions.php and news-raw.xhtml on scons.org.'
+echo '*****'