merge brocken gbp import-orig

6 files changed, 24 insertions, 15 deletions

diff --git a/bin/docs-update-generated.py b/bin/docs-update-generated.py
index 66b22c0..55f0035 100644
--- a/bin/docs-update-generated.py
+++ b/bin/docs-update-generated.py
@@ -8,6 +8,7 @@
 #
 
 import os
+import sys
 import SConsDoc
 
 # Directory where all generated files are stored
@@ -41,8 +42,8 @@ def generate_all():
                 print "Couldn't create destination folder %s! Exiting..." % gen_folder
                 return
         # Call scons-proc.py
-        os.system('python %s -b %s -f %s -t %s -v %s %s' %
-                  (os.path.join('bin','scons-proc.py'),
+        os.system('%s %s -b %s -f %s -t %s -v %s %s' %
+                  (sys.executable, os.path.join('bin','scons-proc.py'),
                    argpair('builders'), argpair('functions'),
                    argpair('tools'), argpair('variables'), ' '.join(flist)))
     
diff --git a/bin/import-test.py b/bin/import-test.py
index b2fa797..0283108 100644
--- a/bin/import-test.py
+++ b/bin/import-test.py
@@ -25,7 +25,7 @@
 # """ triple-quotes will need to have their contents edited by hand.
 #
 
-__revision__ = "bin/import-test.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
+__revision__ = "bin/import-test.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
 
 import os.path
 import sys
diff --git a/bin/linecount.py b/bin/linecount.py
index 4394df4..c921db4 100644
--- a/bin/linecount.py
+++ b/bin/linecount.py
@@ -23,7 +23,7 @@
 # interesting one for most purposes.
 from __future__ import division
 
-__revision__ = "bin/linecount.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
+__revision__ = "bin/linecount.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
 
 import os.path
 
diff --git a/bin/restore.sh b/bin/restore.sh
index 15c3aad..d801c08 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.5
+# Simple hack script to restore __revision__, __COPYRIGHT_, 2.3.6
 # 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.
 #
@@ -24,7 +24,7 @@ for i in `find $DIRS -name '*.py'`; do
     ed $i <<EOF
 g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2015 The SCons Foundation/p
 w
-/^__revision__ = /s/= .*/= "bin/restore.sh pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"/p
+/^__revision__ = /s/= .*/= "bin/restore.sh rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"/p
 w
 q
 EOF
@@ -35,7 +35,7 @@ for i in `find $DIRS -name 'scons.bat'`; do
     ed $i <<EOF
 g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2015 The SCons Foundation/p
 w
-/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog/p
+/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog/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.5"/p
+/^__version__ = /s/= .*/= "2.3.6"/p
 w
-/^__build__ = /s/= .*/= ""/p
+/^__build__ = /s/= .*/= "rel_2.3.5:3347:d31d5a4e74b6[MODIFIED]"/p
 w
-/^__buildsys__ = /s/= .*/= "ubuntu1404-32bit"/p
+/^__buildsys__ = /s/= .*/= "hpmicrodog"/p
 w
-/^__date__ = /s/= .*/= "2015/06/18 06:53:27"/p
+/^__date__ = /s/= .*/= "2015/07/31 14:36:10"/p
 w
 /^__developer__ = /s/= .*/= "bdbaddog"/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.5",/p
+/^ *version = /s/= .*/= "2.3.6",/p
 w
 q
 EOF
@@ -72,9 +72,9 @@ for i in `find $DIRS -name '*.txt'`; do
     ed $i <<EOF
 g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2015 The SCons Foundation/p
 w
-/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog/p
+/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog/p
 w
-/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.3.5/p
+/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.3.6/p
 w
 q
 EOF
diff --git a/bin/scp-sourceforge b/bin/scp-sourceforge
index ad761d1..07df3ea 100755
--- a/bin/scp-sourceforge
+++ b/bin/scp-sourceforge
@@ -19,10 +19,14 @@ do
       sf/$p/$VERSION
 done
 
+cp -p build/scons/README.txt \
+      sf/.
+
 cp -p   build/dist/scons-$VERSION-1.noarch.rpm \
     build/dist/scons-$VERSION-1.src.rpm \
     build/dist/scons-$VERSION.tar.gz \
     build/dist/scons-$VERSION.win32.exe \
+    build/dist/scons-$VERSION.win-amd64.exe \
     build/dist/scons-$VERSION.zip \
     sf/scons/$VERSION
 cp -p   build/dist/scons-local-$VERSION.tar.gz \
@@ -35,4 +39,8 @@ cp -p   build/dist/scons-src-$VERSION.tar.gz \
 # Transmit them in this order, since the most-recent is displayed at the top
 scp -r sf/scons-local/ sf/scons-src/ sf/scons/ \
     $SF_USER,scons@frs.sourceforge.net:/home/pfs/project/s/sc/scons
+
+scp  sf/README.txt \
+    $SF_USER,scons@frs.sourceforge.net:/home/pfs/project/s/sc/scons
+
 rm -rf sf
diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index 6971c9a..9c63ba2 100644
--- a/bin/update-release-info.py
+++ b/bin/update-release-info.py
@@ -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 pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
+__revision__ = "bin/update-release-info.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
 
 import os
 import sys