therubyracer 0.9.0beta4 → 0.9.0beta5

data/ext/v8/upstream/scons/engine/SCons/Tool/MSCommon/__init__.py

@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "src/engine/SCons/Tool/MSCommon/__init__.py 4629 2010/01/17 22:23:21 scons"
-
-__doc__ = """
-Common functions for Microsoft Visual Studio and Visual C/C++.
-"""
-
-import copy
-import os
-import re
-import subprocess
-
-import SCons.Errors
-import SCons.Platform.win32
-import SCons.Util
-
-from SCons.Tool.MSCommon.sdk import mssdk_exists, \
-                                    mssdk_setup_env
-
-from SCons.Tool.MSCommon.vc import msvc_exists, \
-                                   msvc_setup_env, \
-                                   msvc_setup_env_once
-
-from SCons.Tool.MSCommon.vs import get_default_version, \
-                                   get_vs_by_version, \
-                                   merge_default_version, \
-                                   msvs_exists, \
-                                   query_versions
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:

data/ext/v8/upstream/scons/engine/SCons/Tool/MSCommon/arch.py

@@ -1,61 +0,0 @@
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "src/engine/SCons/Tool/MSCommon/arch.py 4629 2010/01/17 22:23:21 scons"
-
-__doc__ = """Module to define supported Windows chip architectures.
-"""
-
-import os
-
-class ArchDefinition:
-    """
-    A class for defining architecture-specific settings and logic.
-    """
-    def __init__(self, arch, synonyms=[]):
-        self.arch = arch
-        self.synonyms = synonyms
-
-SupportedArchitectureList = [
-    ArchitectureDefinition(
-        'x86',
-        ['i386', 'i486', 'i586', 'i686'],
-    ),
-
-    ArchitectureDefinition(
-        'x86_64',
-        ['AMD64', 'amd64', 'em64t', 'EM64T', 'x86_64'],
-    ),
-
-    ArchitectureDefinition(
-        'ia64',
-        ['IA64'],
-    ),
-]
-
-SupportedArchitectureMap = {}
-for a in SupportedArchitectureList:
-    SupportedArchitectureMap[a.arch] = a
-    for s in a.synonyms:
-        SupportedArchitectureMap[s] = a
-

data/ext/v8/upstream/scons/engine/SCons/Tool/MSCommon/common.py

@@ -1,210 +0,0 @@
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "src/engine/SCons/Tool/MSCommon/common.py 4629 2010/01/17 22:23:21 scons"
-
-__doc__ = """
-Common helper functions for working with the Microsoft tool chain.
-"""
-
-import copy
-import os
-import subprocess
-import re
-
-import SCons.Util
-
-
-logfile = os.environ.get('SCONS_MSCOMMON_DEBUG')
-if logfile == '-':
-    def debug(x):
-        print x
-elif logfile:
-    try:
-        import logging
-    except ImportError:
-        debug = lambda x: open(logfile, 'a').write(x + '\n')
-    else:
-        logging.basicConfig(filename=logfile, level=logging.DEBUG)
-        debug = logging.debug
-else:
-    debug = lambda x: None
-
-
-_is_win64 = None
-
-def is_win64():
-    """Return true if running on windows 64 bits.
-    
-    Works whether python itself runs in 64 bits or 32 bits."""
-    # Unfortunately, python does not provide a useful way to determine
-    # if the underlying Windows OS is 32-bit or 64-bit.  Worse, whether
-    # the Python itself is 32-bit or 64-bit affects what it returns,
-    # so nothing in sys.* or os.* help.  
-
-    # Apparently the best solution is to use env vars that Windows
-    # sets.  If PROCESSOR_ARCHITECTURE is not x86, then the python
-    # process is running in 64 bit mode (on a 64-bit OS, 64-bit
-    # hardware, obviously).
-    # If this python is 32-bit but the OS is 64, Windows will set
-    # ProgramW6432 and PROCESSOR_ARCHITEW6432 to non-null.
-    # (Checking for HKLM\Software\Wow6432Node in the registry doesn't
-    # work, because some 32-bit installers create it.)
-    global _is_win64
-    if _is_win64 is None:
-        # I structured these tests to make it easy to add new ones or
-        # add exceptions in the future, because this is a bit fragile.
-        _is_win64 = False
-        if os.environ.get('PROCESSOR_ARCHITECTURE','x86') != 'x86':
-            _is_win64 = True
-        if os.environ.get('PROCESSOR_ARCHITEW6432'):
-            _is_win64 = True
-        if os.environ.get('ProgramW6432'):
-            _is_win64 = True
-    return _is_win64
-
-
-def read_reg(value):
-    return SCons.Util.RegGetValue(SCons.Util.HKEY_LOCAL_MACHINE, value)[0]
-
-def has_reg(value):
-    """Return True if the given key exists in HKEY_LOCAL_MACHINE, False
-    otherwise."""
-    try:
-        SCons.Util.RegOpenKeyEx(SCons.Util.HKEY_LOCAL_MACHINE, value)
-        ret = True
-    except WindowsError:
-        ret = False
-    return ret
-
-# Functions for fetching environment variable settings from batch files.
-
-def normalize_env(env, keys):
-    """Given a dictionary representing a shell environment, add the variables
-    from os.environ needed for the processing of .bat files; the keys are
-    controlled by the keys argument.
-
-    It also makes sure the environment values are correctly encoded.
-
-    Note: the environment is copied"""
-    normenv = {}
-    if env:
-        for k in env.keys():
-            normenv[k] = copy.deepcopy(env[k]).encode('mbcs')
-
-        for k in keys:
-            if os.environ.has_key(k):
-                normenv[k] = os.environ[k].encode('mbcs')
-
-    return normenv
-
-def get_output(vcbat, args = None, env = None):
-    """Parse the output of given bat file, with given args."""
-    if args:
-        debug("Calling '%s %s'" % (vcbat, args))
-        popen = subprocess.Popen('"%s" %s & set' % (vcbat, args),
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.PIPE,
-                                 env=env)
-    else:
-        debug("Calling '%s'" % vcbat)
-        popen = subprocess.Popen('"%s" & set' % vcbat,
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.PIPE,
-                                 env=env)
-
-    # Use the .stdout and .stderr attributes directly because the
-    # .communicate() method uses the threading module on Windows
-    # and won't work under Pythons not built with threading.
-    stdout = popen.stdout.read()
-    if popen.wait() != 0:
-        raise IOError(popen.stderr.read().decode("mbcs"))
-
-    output = stdout.decode("mbcs")
-    return output
-
-def parse_output(output, keep = ("INCLUDE", "LIB", "LIBPATH", "PATH")):
-    # dkeep is a dict associating key: path_list, where key is one item from
-    # keep, and pat_list the associated list of paths
-
-    # TODO(1.5):  replace with the following list comprehension:
-    #dkeep = dict([(i, []) for i in keep])
-    dkeep = dict(map(lambda i: (i, []), keep))
-
-    # rdk will  keep the regex to match the .bat file output line starts
-    rdk = {}
-    for i in keep:
-        rdk[i] = re.compile('%s=(.*)' % i, re.I)
-
-    def add_env(rmatch, key, dkeep=dkeep):
-        plist = rmatch.group(1).split(os.pathsep)
-        for p in plist:
-            # Do not add empty paths (when a var ends with ;)
-            if p:
-                p = p.encode('mbcs')
-                # XXX: For some reason, VC98 .bat file adds "" around the PATH
-                # values, and it screws up the environment later, so we strip
-                # it. 
-                p = p.strip('"')
-                dkeep[key].append(p)
-
-    for line in output.splitlines():
-        for k,v in rdk.items():
-            m = v.match(line)
-            if m:
-                add_env(m, k)
-
-    return dkeep
-
-# TODO(sgk): unused
-def output_to_dict(output):
-    """Given an output string, parse it to find env variables.
-
-    Return a dict where keys are variables names, and values their content"""
-    envlinem = re.compile(r'^([a-zA-z0-9]+)=([\S\s]*)$')
-    parsedenv = {}
-    for line in output.splitlines():
-        m = envlinem.match(line)
-        if m:
-            parsedenv[m.group(1)] = m.group(2)
-    return parsedenv
-
-# TODO(sgk): unused
-def get_new(l1, l2):
-    """Given two list l1 and l2, return the items in l2 which are not in l1.
-    Order is maintained."""
-
-    # We don't try to be smart: lists are small, and this is not the bottleneck
-    # is any case
-    new = []
-    for i in l2:
-        if i not in l1:
-            new.append(i)
-
-    return new
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:

data/ext/v8/upstream/scons/engine/SCons/Tool/MSCommon/netframework.py

@@ -1,84 +0,0 @@
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "src/engine/SCons/Tool/MSCommon/netframework.py 4629 2010/01/17 22:23:21 scons"
-
-__doc__ = """
-"""
-
-import os
-import re
-import string
-
-from common import read_reg, debug
-
-# Original value recorded by dcournapeau
-_FRAMEWORKDIR_HKEY_ROOT = r'Software\Microsoft\.NETFramework\InstallRoot'
-# On SGK's system
-_FRAMEWORKDIR_HKEY_ROOT = r'Software\Microsoft\Microsoft SDKs\.NETFramework\v2.0\InstallationFolder'
-
-def find_framework_root():
-    # XXX: find it from environment (FrameworkDir)
-    try:
-        froot = read_reg(_FRAMEWORKDIR_HKEY_ROOT)
-        debug("Found framework install root in registry: %s" % froot)
-    except WindowsError, e:
-        debug("Could not read reg key %s" % _FRAMEWORKDIR_HKEY_ROOT)
-        return None
-
-    if not os.path.exists(froot):
-        debug("%s not found on fs" % froot)
-        return None
-
-    return froot
-
-def query_versions():
-    froot = find_framework_root()
-    if froot:
-        contents = os.listdir(froot)
-
-        l = re.compile('v[0-9]+.*')
-        versions = filter(lambda e, l=l: l.match(e), contents)
-
-        def versrt(a,b):
-            # since version numbers aren't really floats...
-            aa = a[1:]
-            bb = b[1:]
-            aal = string.split(aa, '.')
-            bbl = string.split(bb, '.')
-            # sequence comparison in python is lexicographical
-            # which is exactly what we want.
-            # Note we sort backwards so the highest version is first.
-            return cmp(bbl,aal)
-
-        versions.sort(versrt)
-    else:
-        versions = []
-
-    return versions
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:

data/ext/v8/upstream/scons/engine/SCons/Tool/MSCommon/sdk.py

@@ -1,321 +0,0 @@
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "src/engine/SCons/Tool/MSCommon/sdk.py 4629 2010/01/17 22:23:21 scons"
-
-__doc__ = """Module to detect the Platform/Windows SDK
-
-PSDK 2003 R1 is the earliest version detected.
-"""
-
-import os
-
-import SCons.Errors
-import SCons.Util
-
-import common
-
-debug = common.debug
-
-# SDK Checks. This is of course a mess as everything else on MS platforms. Here
-# is what we do to detect the SDK:
-#
-# For Windows SDK >= 6.0: just look into the registry entries:
-#   HKLM\Software\Microsoft\Microsoft SDKs\Windows
-# All the keys in there are the available versions.
-#
-# For Platform SDK before 6.0 (2003 server R1 and R2, etc...), there does not
-# seem to be any sane registry key, so the precise location is hardcoded.
-#
-# For versions below 2003R1, it seems the PSDK is included with Visual Studio?
-#
-# Also, per the following:
-#     http://benjamin.smedbergs.us/blog/tag/atl/
-# VC++ Professional comes with the SDK, VC++ Express does not.
-
-# Location of the SDK (checked for 6.1 only)
-_CURINSTALLED_SDK_HKEY_ROOT = \
-        r"Software\Microsoft\Microsoft SDKs\Windows\CurrentInstallFolder"
-
-
-class SDKDefinition:
-    """
-    An abstract base class for trying to find installed SDK directories.
-    """
-    def __init__(self, version, **kw):
-        self.version = version
-        self.__dict__.update(kw)
-
-    def find_sdk_dir(self):
-        """Try to find the MS SDK from the registry.
-
-        Return None if failed or the directory does not exist.
-        """
-        if not SCons.Util.can_read_reg:
-            debug('find_sdk_dir(): can not read registry')
-            return None
-
-        hkey = self.HKEY_FMT % self.hkey_data
-
-        try:
-            sdk_dir = common.read_reg(hkey)
-        except WindowsError, e:
-            debug('find_sdk_dir(): no SDK registry key %s' % repr(hkey))
-            return None
-
-        if not os.path.exists(sdk_dir):
-            debug('find_sdk_dir():  %s not on file system' % sdk_dir)
-            return None
-
-        ftc = os.path.join(sdk_dir, self.sanity_check_file)
-        if not os.path.exists(ftc):
-            debug("find_sdk_dir(): sanity check %s not found" % ftc)
-            return None
-
-        return sdk_dir
-
-    def get_sdk_dir(self):
-        """Return the MSSSDK given the version string."""
-        try:
-            return self._sdk_dir
-        except AttributeError:
-            sdk_dir = self.find_sdk_dir()
-            self._sdk_dir = sdk_dir
-            return sdk_dir
-
-class WindowsSDK(SDKDefinition):
-    """
-    A subclass for trying to find installed Windows SDK directories.
-    """
-    HKEY_FMT = r'Software\Microsoft\Microsoft SDKs\Windows\v%s\InstallationFolder'
-    def __init__(self, *args, **kw):
-        apply(SDKDefinition.__init__, (self,)+args, kw)
-        self.hkey_data = self.version
-
-class PlatformSDK(SDKDefinition):
-    """
-    A subclass for trying to find installed Platform SDK directories.
-    """
-    HKEY_FMT = r'Software\Microsoft\MicrosoftSDK\InstalledSDKS\%s\Install Dir'
-    def __init__(self, *args, **kw):
-        apply(SDKDefinition.__init__, (self,)+args, kw)
-        self.hkey_data = self.uuid
-
-# The list of support SDKs which we know how to detect.
-#
-# The first SDK found in the list is the one used by default if there
-# are multiple SDKs installed.  Barring good reasons to the contrary,
-# this means we should list SDKs with from most recent to oldest.
-#
-# If you update this list, update the documentation in Tool/mssdk.xml.
-SupportedSDKList = [
-    WindowsSDK('6.1',
-               sanity_check_file=r'bin\SetEnv.Cmd',
-               include_subdir='include',
-               lib_subdir={
-                   'x86'       : ['lib'],
-                   'x86_64'    : [r'lib\x64'],
-                   'ia64'      : [r'lib\ia64'],
-               },
-              ),
-
-    WindowsSDK('6.0A',
-               sanity_check_file=r'include\windows.h',
-               include_subdir='include',
-               lib_subdir={
-                   'x86'       : ['lib'],
-                   'x86_64'    : [r'lib\x64'],
-                   'ia64'      : [r'lib\ia64'],
-               },
-              ),
-
-    WindowsSDK('6.0',
-               sanity_check_file=r'bin\gacutil.exe',
-               include_subdir='include',
-               lib_subdir='lib',
-              ),
-
-    PlatformSDK('2003R2',
-                sanity_check_file=r'SetEnv.Cmd',
-                uuid="D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1"
-               ),
-
-    PlatformSDK('2003R1',
-                sanity_check_file=r'SetEnv.Cmd',
-                uuid="8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3",
-               ),
-]
-
-SupportedSDKMap = {}
-for sdk in SupportedSDKList:
-    SupportedSDKMap[sdk.version] = sdk
-
-
-# Finding installed SDKs isn't cheap, because it goes not only to the
-# registry but also to the disk to sanity-check that there is, in fact,
-# an SDK installed there and that the registry entry isn't just stale.
-# Find this information once, when requested, and cache it.
-
-InstalledSDKList = None
-InstalledSDKMap = None
-
-def get_installed_sdks():
-    global InstalledSDKList
-    global InstalledSDKMap
-    if InstalledSDKList is None:
-        InstalledSDKList = []
-        InstalledSDKMap = {}
-        for sdk in SupportedSDKList:
-            debug('trying to find SDK %s' % sdk.version)
-            if sdk.get_sdk_dir():
-                debug('found SDK %s' % sdk.version)
-                InstalledSDKList.append(sdk)
-                InstalledSDKMap[sdk.version] = sdk
-    return InstalledSDKList
-
-
-# We may be asked to update multiple construction environments with
-# SDK information.  When doing this, we check on-disk for whether
-# the SDK has 'mfc' and 'atl' subdirectories.  Since going to disk
-# is expensive, cache results by directory.
-
-SDKEnvironmentUpdates = {}
-
-def set_sdk_by_directory(env, sdk_dir):
-    global SDKEnvironmentUpdates
-    try:
-        env_tuple_list = SDKEnvironmentUpdates[sdk_dir]
-    except KeyError:
-        env_tuple_list = []
-        SDKEnvironmentUpdates[sdk_dir] = env_tuple_list
-
-        include_path = os.path.join(sdk_dir, 'include')
-        mfc_path = os.path.join(include_path, 'mfc')
-        atl_path = os.path.join(include_path, 'atl')
-
-        if os.path.exists(mfc_path):
-            env_tuple_list.append(('INCLUDE', mfc_path))
-        if os.path.exists(atl_path):
-            env_tuple_list.append(('INCLUDE', atl_path))
-        env_tuple_list.append(('INCLUDE', include_path))
-
-        env_tuple_list.append(('LIB', os.path.join(sdk_dir, 'lib')))
-        env_tuple_list.append(('LIBPATH', os.path.join(sdk_dir, 'lib')))
-        env_tuple_list.append(('PATH', os.path.join(sdk_dir, 'bin')))
-
-    for variable, directory in env_tuple_list:
-        env.PrependENVPath(variable, directory)
-
-
-# TODO(sgk):  currently unused; remove?
-def get_cur_sdk_dir_from_reg():
-    """Try to find the platform sdk directory from the registry.
-
-    Return None if failed or the directory does not exist"""
-    if not SCons.Util.can_read_reg:
-        debug('SCons cannot read registry')
-        return None
-
-    try:
-        val = common.read_reg(_CURINSTALLED_SDK_HKEY_ROOT)
-        debug("Found current sdk dir in registry: %s" % val)
-    except WindowsError, e:
-        debug("Did not find current sdk in registry")
-        return None
-
-    if not os.path.exists(val):
-        debug("Current sdk dir %s not on fs" % val)
-        return None
-
-    return val
-
-def get_sdk_by_version(mssdk):
-    if not SupportedSDKMap.has_key(mssdk):
-        msg = "SDK version %s is not supported" % repr(mssdk)
-        raise SCons.Errors.UserError, msg
-    get_installed_sdks()
-    return InstalledSDKMap.get(mssdk)
-
-def get_default_sdk():
-    """Set up the default Platform/Windows SDK."""
-    get_installed_sdks()
-    if not InstalledSDKList:
-        return None
-    return InstalledSDKList[0]
-
-def mssdk_setup_env(env):
-    debug('msvs_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)
-    elif env.has_key('MSSDK_VERSION'):
-        sdk_version = env['MSSDK_VERSION']
-        if sdk_version is None:
-            msg = "SDK version %s is not installed" % repr(mssdk)
-            raise SCons.Errors.UserError, msg
-        sdk_version = env.subst(sdk_version)
-        mssdk = get_sdk_by_version(sdk_version)
-        sdk_dir = mssdk.get_sdk_dir()
-    elif env.has_key('MSVS_VERSION'):
-        msvs_version = env['MSVS_VERSION']
-        debug('Getting MSVS_VERSION from env:%s'%msvs_version)
-        if 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)
-        if not msvs:
-            return
-        sdk_version = msvs.sdk_version
-        if not sdk_version:
-            return
-        mssdk = get_sdk_by_version(sdk_version)
-        if not mssdk:
-            mssdk = get_default_sdk()
-            if not mssdk:
-                return
-        sdk_dir = mssdk.get_sdk_dir()
-    else:
-        mssdk = get_default_sdk()
-        if not mssdk:
-            return
-        sdk_dir = mssdk.get_sdk_dir()
-
-    set_sdk_by_directory(env, sdk_dir)
-
-    #print "No MSVS_VERSION: this is likely to be a bug"
-
-def mssdk_exists(version=None):
-    sdks = get_installed_sdks()
-    if version is None:
-        return len(sdks) > 0
-    return sdks.has_key(version)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4: