summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Techtonik <techtonik@gmail.com>2010-07-05 20:25:39 (GMT)
committerAnatoly Techtonik <techtonik@gmail.com>2010-07-05 20:25:39 (GMT)
commitb48b4b61203d881cea5d3077d570870dae8d710c (patch)
treef1d2de213980dcea8f5f2aae92f3c7cbbd26992a
parent9cd3bd61a426a2c1dad2fb0c6a52d08f56493c02 (diff)
downloadSCons-b48b4b61203d881cea5d3077d570870dae8d710c.zip
SCons-b48b4b61203d881cea5d3077d570870dae8d710c.tar.gz
SCons-b48b4b61203d881cea5d3077d570870dae8d710c.tar.bz2
use subprocess in bootstrap.py instead of os.execve to avoid losing
output control on Windows - see http://bugs.python.org/issue9148
-rw-r--r--bootstrap.py3
-rw-r--r--src/CHANGES.txt5
2 files changed, 7 insertions, 1 deletions
diff --git a/bootstrap.py b/bootstrap.py
index a04dbc8..3f76138 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -24,6 +24,7 @@
import os
import os.path
import sys
+import subprocess
__doc__ = """bootstrap.py
@@ -200,7 +201,7 @@ sys.stdout.flush()
os.environ['SCONS_LIB_DIR'] = os.path.join(bootstrap_dir, src_engine)
-os.execve(sys.executable, args, os.environ)
+sys.exit(subprocess.Popen(args, env=os.environ).wait())
# Local Variables:
# tab-width:4
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 0df4d37..d87427c 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -7,6 +7,11 @@
RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+ From Anatoly Techtonik:
+
+ - use subprocess in bootstrap.py instead of os.execve to avoid
+ losing output control on Windows (http://bugs.python.org/issue9148)
+
From Alexander Goomenyuk:
- Add .sx to assembly source scanner list so .sx files