summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2009-05-11 15:49:12 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2009-05-11 15:49:12 (GMT)
commitb44d0f7897c5582b72641b79862cc901faa655c1 (patch)
tree349777673c5e14692920b787d5177285993e7004 /SConstruct
parent6cab1d1b6453171260e46f9cf0aab09cad62c34c (diff)
downloadSCons-b44d0f7897c5582b72641b79862cc901faa655c1.zip
SCons-b44d0f7897c5582b72641b79862cc901faa655c1.tar.gz
SCons-b44d0f7897c5582b72641b79862cc901faa655c1.tar.bz2
Make building SCons distribution on Windows work better: make whereis() look for .exe as well as original filename on Windows.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct25
1 files changed, 15 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct
index 1c0ebbe..c4ce97e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -48,6 +48,8 @@ project = 'scons'
default_version = '1.2.0'
copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
+platform = distutils.util.get_platform()
+
SConsignFile()
#
@@ -55,15 +57,20 @@ SConsignFile()
# is available on this system.
#
def whereis(file):
+ exts = ['']
+ if platform == "win32":
+ exts += ['.exe']
for dir in string.split(os.environ['PATH'], os.pathsep):
f = os.path.join(dir, file)
- if os.path.isfile(f):
- try:
- st = os.stat(f)
- except:
- continue
- if stat.S_IMODE(st[stat.ST_MODE]) & 0111:
- return f
+ for ext in exts:
+ f_ext = f + ext
+ if os.path.isfile(f_ext):
+ try:
+ st = os.stat(f_ext)
+ except:
+ continue
+ if stat.S_IMODE(st[stat.ST_MODE]) & 0111:
+ return f_ext
return None
#
@@ -163,8 +170,6 @@ if build_id is None:
python_ver = sys.version[0:3]
-platform = distutils.util.get_platform()
-
# Re-exporting LD_LIBRARY_PATH is necessary if the Python version was
# built with the --enable-shared option.
@@ -836,7 +841,7 @@ for p in [ scons ]:
AddPostAction(dist_distutils_targets, Chmod(dist_distutils_targets, 0644))
if not gzip:
- print "gzip not found; skipping .tar.gz package for %s." % pkg
+ print "gzip not found in %s; skipping .tar.gz package for %s." % (os.environ['PATH'], pkg)
else:
distutils_formats.append('gztar')