diff options
| author | William Deegan <bill@baddogconsulting.com> | 2010-03-16 06:26:00 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2010-03-16 06:26:00 (GMT) |
| commit | 6935e631382ddbb0c6e2d18b9f43086324311ca8 (patch) | |
| tree | f114c7452c9a86b468918627a622d510f24a9297 /src | |
| parent | f4ef7dc0f4b083356505a18ee9883c3a18165387 (diff) | |
| download | SCons-6935e631382ddbb0c6e2d18b9f43086324311ca8.zip SCons-6935e631382ddbb0c6e2d18b9f43086324311ca8.tar.gz SCons-6935e631382ddbb0c6e2d18b9f43086324311ca8.tar.bz2 | |
More VS/VC/SDK debug code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/sdk.py | 16 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vs.py | 1 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/sdk.py b/src/engine/SCons/Tool/MSCommon/sdk.py index ccc8db0..74dc43c 100644 --- a/src/engine/SCons/Tool/MSCommon/sdk.py +++ b/src/engine/SCons/Tool/MSCommon/sdk.py @@ -240,6 +240,7 @@ InstalledSDKMap = None def get_installed_sdks(): global InstalledSDKList global InstalledSDKMap + debug('sdk.py:get_installed_sdks()') if InstalledSDKList is None: InstalledSDKList = [] InstalledSDKMap = {} @@ -322,8 +323,11 @@ def get_default_sdk(): return None return InstalledSDKList[0] + + + def mssdk_setup_env(env): - debug('mssdk_setup_env()') + debug('sdk.py:mssdk_setup_env()') if env.has_key('MSSDK_DIR'): sdk_dir = env['MSSDK_DIR'] if sdk_dir is None: @@ -341,16 +345,18 @@ def mssdk_setup_env(env): debug('mssdk_setup_env: Using MSSDK_VERSION:%s'%sdk_dir) elif env.has_key('MSVS_VERSION'): msvs_version = env['MSVS_VERSION'] - debug('Getting MSVS_VERSION from env:%s'%msvs_version) + debug('sdk.py:mssdk_setup_env:Getting MSVS_VERSION from env:%s'%msvs_version) if msvs_version is None: + debug('sdk.py:mssdk_setup_env thinks msvs_version is None') return msvs_version = env.subst(msvs_version) import vs msvs = vs.get_vs_by_version(msvs_version) - debug('msvs is :%s'%msvs) + debug('sdk.py:mssdk_setup_env:msvs is :%s'%msvs) if not msvs: return sdk_version = msvs.sdk_version + debug('sdk.py:msvs.sdk_version is %s'%sdk_version) if not sdk_version: return mssdk = get_sdk_by_version(sdk_version) @@ -359,13 +365,13 @@ def mssdk_setup_env(env): if not mssdk: return sdk_dir = mssdk.get_sdk_dir() - debug('mssdk_setup_env: Using MSVS_VERSION:%s'%sdk_dir) + debug('sdk.py:mssdk_setup_env: Using MSVS_VERSION:%s'%sdk_dir) else: mssdk = get_default_sdk() if not mssdk: return sdk_dir = mssdk.get_sdk_dir() - debug('mssdk_setup_env: not using any env values. sdk_dir:%s'%sdk_dir) + debug('sdk.py:mssdk_setup_env: not using any env values. sdk_dir:%s'%sdk_dir) set_sdk_by_directory(env, sdk_dir) diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py index 888d8da..15876f9 100644 --- a/src/engine/SCons/Tool/MSCommon/vs.py +++ b/src/engine/SCons/Tool/MSCommon/vs.py @@ -384,6 +384,7 @@ def get_vs_by_version(msvs): global InstalledVSMap global SupportedVSMap + debug('vs.py:get_vs_by_version()') if not SupportedVSMap.has_key(msvs): msg = "Visual Studio version %s is not supported" % repr(msvs) raise SCons.Errors.UserError, msg |