From: bdbaddog <bdbaddog@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Tue, 16 Mar 2010 06:26:00 +0000 (+0000)
Subject: More VS/VC/SDK debug code.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1587a9fd4a4148e2cc85c59ef1bb017256b96299;p=scons.git

More VS/VC/SDK debug code.


git-svn-id: http://scons.tigris.org/svn/scons/trunk@4704 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/src/engine/SCons/Tool/MSCommon/sdk.py b/src/engine/SCons/Tool/MSCommon/sdk.py
index ccc8db0f..74dc43cd 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 888d8da7..15876f9e 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