summaryrefslogtreecommitdiffstats
path: root/bootstrap.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 (GMT)
committerGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 (GMT)
commit22d352500f1cd6bd0c53d788a5dc44a1fefa676e (patch)
tree0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /bootstrap.py
parent75ac32ac8e32076e25b72a19eb56340cc585fa4e (diff)
downloadSCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.zip
SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.gz
SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.bz2
Move 2.0 changes collected in branches/pending back to trunk for further
development. Note that this set of changes is NOT backward-compatible; the trunk no longer works with Python 1.5.2, 2.0, or 2.1.
Diffstat (limited to 'bootstrap.py')
-rw-r--r--bootstrap.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/bootstrap.py b/bootstrap.py
index 4dad44d..37e8e70 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -23,7 +23,6 @@
import os
import os.path
-import string
import sys
__doc__ = """bootstrap.py
@@ -171,15 +170,15 @@ def find(file, search=search):
if os.path.exists(f):
return os.path.normpath(f)
sys.stderr.write("could not find `%s' in search path:\n" % file)
- sys.stderr.write("\t" + string.join(search, "\n\t") + "\n")
+ sys.stderr.write("\t" + "\n\t".join(search) + "\n")
sys.exit(2)
scons_py = os.path.join('src', 'script', 'scons.py')
src_engine = os.path.join('src', 'engine')
MANIFEST_in = find(os.path.join(src_engine, 'MANIFEST.in'))
-files = [ scons_py ] + map(lambda x: os.path.join(src_engine, x[:-1]),
- open(MANIFEST_in).readlines())
+files = [ scons_py ] + [os.path.join(src_engine, x[:-1])
+ for x in open(MANIFEST_in).readlines()]
for file in files:
src = find(file)
@@ -200,7 +199,7 @@ args = [
os.path.join(bootstrap_dir, scons_py)
] + pass_through_args
-sys.stdout.write(string.join(args, " ") + '\n')
+sys.stdout.write(" ".join(args) + '\n')
sys.stdout.flush()
os.environ['SCONS_LIB_DIR'] = os.path.join(bootstrap_dir, src_engine)