diff options
| author | Steven Knight <knight@baldmt.com> | 2004-02-08 15:56:52 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-02-08 15:56:52 (GMT) |
| commit | 9193f1e90dab322589f26cea54fc94c7ba70e4f2 (patch) | |
| tree | f1363a9731871e7972966445db9a09d5a15d550b /src/engine | |
| parent | 00b13793fe88c9d101c3a73a6809e86298ed3186 (diff) | |
| download | SCons-9193f1e90dab322589f26cea54fc94c7ba70e4f2.zip SCons-9193f1e90dab322589f26cea54fc94c7ba70e4f2.tar.gz SCons-9193f1e90dab322589f26cea54fc94c7ba70e4f2.tar.bz2 | |
More robust reading of VCComponents.dat. (Chad Austin)
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Tool/msvc.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py index ace9cfb..40f8b40 100644 --- a/src/engine/SCons/Tool/msvc.py +++ b/src/engine/SCons/Tool/msvc.py @@ -77,14 +77,16 @@ def _parse_msvc7_overrides(version): found = 0 while line: line.strip() - if found == 1: - (key, val) = line.split('=',1) - key = key.replace(' Dirs','') - dirs[key.upper()] = val if line.find(r'[VC\VC_OBJECTS_PLATFORM_INFO\Win32\Directories]') >= 0: found = 1 - if line == '': + elif line == '' or line[:1] == '[': found = 0 + elif found == 1: + kv = line.split('=', 1) + if len(kv) == 2: + (key, val) = kv + key = key.replace(' Dirs','') + dirs[key.upper()] = val line = f.readline() f.close() else: |