diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-11-25 03:27:20 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-11-25 03:27:20 (GMT) |
| commit | a4ef4b656a37591a77c90e75697a4a096394e371 (patch) | |
| tree | 0d67e004cd572053846ca310c7835878dfffdfe6 | |
| parent | 5128cbccb9c1bd34365d3ed64e1f81ff57b9060c (diff) | |
| download | SCons-a4ef4b656a37591a77c90e75697a4a096394e371.zip SCons-a4ef4b656a37591a77c90e75697a4a096394e371.tar.gz SCons-a4ef4b656a37591a77c90e75697a4a096394e371.tar.bz2 | |
A couple more test fixes, to make test/import.py work on Linux.
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vs.py | 6 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvs.py | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py index 4fda0db..888d8da 100644 --- a/src/engine/SCons/Tool/MSCommon/vs.py +++ b/src/engine/SCons/Tool/MSCommon/vs.py @@ -68,11 +68,11 @@ class VisualStudio: def find_vs_dir_by_vc(self): SCons.Tool.MSCommon.vc.get_installed_vcs() - ivc = SCons.Tool.MSCommon.vc.InstalledVCMap.get(self.vc_version) - if not ivc: + dir = SCons.Tool.MSCommon.vc.find_vc_pdir(self.vc_version) + if not dir: debug('find_vs_dir(): no installed VC %s' % self.vc_version) return None - return ivc.get_vc_dir()[:-len(ivc.vc_subdir)] + return dir def find_vs_dir_by_reg(self): root = 'Software\\' diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index 89bd985..f43dd94 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -1410,7 +1410,12 @@ def generate(env): # Set-up ms tools paths for default version msvc_setup_env_once(env) - version_num, suite = msvs_parse_version(env['MSVS_VERSION']) + if env.has_key('MSVS_VERSION'): + version_num, suite = msvs_parse_version(env['MSVS_VERSION']) + else: + (version_num, suite) = (7.0, None) # guess at a default + if not env.has_key('MSVS'): + env['MSVS'] = {} if (version_num < 7.0): env['MSVS']['PROJECTSUFFIX'] = '.dsp' env['MSVS']['SOLUTIONSUFFIX'] = '.dsw' |