diff options
| author | Steven Knight <knight@baldmt.com> | 2003-12-02 13:45:59 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-12-02 13:45:59 (GMT) |
| commit | 983b4c11d302fb87f34a204170b3aadc4f2d72cb (patch) | |
| tree | 543488b71a4826be52f9b8b669784eb4623e60cc | |
| parent | a5be48b5b4511b3097bbcfe82868d9f6eb32300d (diff) | |
| download | SCons-983b4c11d302fb87f34a204170b3aadc4f2d72cb.zip SCons-983b4c11d302fb87f34a204170b3aadc4f2d72cb.tar.gz SCons-983b4c11d302fb87f34a204170b3aadc4f2d72cb.tar.bz2 | |
MSVC fix for pre-2.3 Python versions. (Charles Crain)
| -rw-r--r-- | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvc.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 8e1054a..c9a4ad6 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -23,6 +23,8 @@ RELEASE 0.95 - XXX - Fix an incorrect _concat() call in the $RCINCFLAGS definition for the mingw Tool. + - Fix a problem with the msvc tool with Python versions prior to 2.3. + From David M. Cooke: - Make the Fortran scanner case-insensitive for the INCLUDE string. diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py index f7ec5e4..b9ce9bc 100644 --- a/src/engine/SCons/Tool/msvc.py +++ b/src/engine/SCons/Tool/msvc.py @@ -133,7 +133,7 @@ def _get_msvc7_path(path, version, platform): # do weird things with the $(xxx)'s s = re.compile('\$\(([a-zA-Z0-9_]+?)\)') - def repl(match): + def repl(match, paths=paths): key = string.upper(match.group(1)) if paths.has_key(key): return paths[key] |