summaryrefslogtreecommitdiff
path: root/engine/SCons/Tool/MSCommon/sdk.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-03-25 20:26:34 +0100
committerLuca Falavigna <dktrkranz@debian.org>2010-03-25 20:26:34 +0100
commit738c66a8458f4ddd5c11871359938bc9d89e8d7a (patch)
tree5b57e837a551c1479efec2e2bfebf154c529bf68 /engine/SCons/Tool/MSCommon/sdk.py
parent8f9034d6737799e699f3d2c9c7de2c98682343bd (diff)
parent86baccee0a1dddf43f7eefe48e2d9e9037468b9c (diff)
Merge commit 'upstream/1.3.0'
Diffstat (limited to 'engine/SCons/Tool/MSCommon/sdk.py')
-rw-r--r--engine/SCons/Tool/MSCommon/sdk.py26
1 files changed, 18 insertions, 8 deletions
diff --git a/engine/SCons/Tool/MSCommon/sdk.py b/engine/SCons/Tool/MSCommon/sdk.py
index 24b85d6..54be8ca 100644
--- a/engine/SCons/Tool/MSCommon/sdk.py
+++ b/engine/SCons/Tool/MSCommon/sdk.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/MSCommon/sdk.py 4691 2010/03/06 16:22:36 bdbaddog"
+__revision__ = "src/engine/SCons/Tool/MSCommon/sdk.py 4720 2010/03/24 03:14:11 jars"
__doc__ = """Module to detect the Platform/Windows SDK
@@ -76,6 +76,7 @@ class SDKDefinition:
return None
hkey = self.HKEY_FMT % self.hkey_data
+ debug('find_sdk_dir(): checking registry:%s'%hkey)
try:
sdk_dir = common.read_reg(hkey)
@@ -83,6 +84,8 @@ class SDKDefinition:
debug('find_sdk_dir(): no SDK registry key %s' % repr(hkey))
return None
+ debug('find_sdk_dir(): Trying SDK Dir: %s'%sdk_dir)
+
if not os.path.exists(sdk_dir):
debug('find_sdk_dir(): %s not on file system' % sdk_dir)
return None
@@ -237,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 = {}
@@ -319,14 +323,17 @@ 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:
return
sdk_dir = env.subst(sdk_dir)
- debug('mssdk_setup_env: Using MSSDK_DIR:%s'%sdk_dir)
+ debug('sdk.py:mssdk_setup_env: Using MSSDK_DIR:%s'%sdk_dir)
elif env.has_key('MSSDK_VERSION'):
sdk_version = env['MSSDK_VERSION']
if sdk_version is None:
@@ -335,19 +342,22 @@ def mssdk_setup_env(env):
sdk_version = env.subst(sdk_version)
mssdk = get_sdk_by_version(sdk_version)
sdk_dir = mssdk.get_sdk_dir()
- debug('mssdk_setup_env: Using MSSDK_VERSION:%s'%sdk_dir)
+ debug('sdk.py: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:
+ debug('sdk.py:mssdk_setup_env: no VS version detected, bailingout:%s'%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)
@@ -356,13 +366,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)