diff options
| author | Steven Knight <knight@baldmt.com> | 2002-08-28 16:01:52 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-08-28 16:01:52 (GMT) |
| commit | 36e06c5c7557d40c4d4953e56f8c80d2a27bdd93 (patch) | |
| tree | 7bd168d5cf33631bbeeae2e8890acf1da471427d | |
| parent | 5579408699ca7d0c1da071ad61685d1635ecd4fe (diff) | |
| download | SCons-36e06c5c7557d40c4d4953e56f8c80d2a27bdd93.zip SCons-36e06c5c7557d40c4d4953e56f8c80d2a27bdd93.tar.gz SCons-36e06c5c7557d40c4d4953e56f8c80d2a27bdd93.tar.bz2 | |
On Win32 systems, supply a default if PATHEXT isn't in the environment; it doesn't exist on Win95/Win98.
| -rw-r--r-- | src/engine/SCons/Util.py | 5 | ||||
| -rw-r--r-- | test/Repository/StaticLibrary.py | 4 | ||||
| -rw-r--r-- | test/Repository/link-object.py | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py index 5178956..63c992e 100644 --- a/src/engine/SCons/Util.py +++ b/src/engine/SCons/Util.py @@ -433,7 +433,10 @@ if sys.platform == 'win32': if is_String(path): path = string.split(path, os.pathsep) if pathext is None: - pathext = os.environ['PATHEXT'] + try: + pathext = os.environ['PATHEXT'] + except KeyError: + pathext = '.COM;.EXE;.BAT;.CMD' if is_String(pathext): pathext = string.split(pathext, os.pathsep) for ext in pathext: diff --git a/test/Repository/StaticLibrary.py b/test/Repository/StaticLibrary.py index 3861ce9..14b9c3b 100644 --- a/test/Repository/StaticLibrary.py +++ b/test/Repository/StaticLibrary.py @@ -115,7 +115,7 @@ test.fail_test(os.path.exists(repository_foo)) test.up_to_date(chdir = 'work1', options = opts, arguments = ".") -test.write(['work1', 'bbb.c'], """ +test.write(['work1', 'bbb.c'], r""" void bbb(void) { @@ -161,7 +161,7 @@ test.writable('repository', 0) # test.up_to_date(chdir = 'work2', options = opts, arguments = ".") -test.write(['work2', 'bbb.c'], """ +test.write(['work2', 'bbb.c'], r""" void bbb(void) { diff --git a/test/Repository/link-object.py b/test/Repository/link-object.py index af0214e..90d2e70 100644 --- a/test/Repository/link-object.py +++ b/test/Repository/link-object.py @@ -106,7 +106,7 @@ env.Program(target = 'foo', source = ['aaa.c', 'bbb.c', 'foo.c']) test.up_to_date(chdir = 'work', arguments = ".") # -test.write(['work', 'bbb.c'], """ +test.write(['work', 'bbb.c'], r""" void bbb(void) { |