Properly initialize Windows SDK environment via SetEnv.cmd. Prefer Visual C++ environment script if exists (vcvars32/64.bat)

2 files changed, 72 insertions, 8 deletions

diff --git a/setup.py b/setup.py
index 54609f210..b16e971f0 100644
--- a/setup.py
+++ b/setup.py
@@ -287,7 +287,11 @@ class pyside_build(_build):
     def run(self):
         platform_arch = platform.architecture()[0]
         log.info("Python architecture is %s" % platform_arch)
-        
+
+        build_type = OPTION_DEBUG and "Debug" or "Release"
+        if OPTION_RELWITHDEBINFO:
+            build_type = 'RelWithDebInfo'
+
         # Check env
         make_path = None
         make_generator = None
@@ -299,7 +303,7 @@ class pyside_build(_build):
                 nmake_path = find_executable("nmake")
                 if nmake_path is None or not os.path.exists(nmake_path):
                     log.info("nmake not found. Trying to initialize the MSVC env...")
-                    init_msvc_env(platform_arch, log)
+                    init_msvc_env(platform_arch, build_type, log)
                 else:
                     log.info("nmake was found in %s" % nmake_path)
                 if OPTION_JOM:
@@ -331,9 +335,6 @@ class pyside_build(_build):
                 " Please specify the path to qmake with --qmake parameter.")
         
         # Prepare parameters
-        build_type = OPTION_DEBUG and "Debug" or "Release"
-        if OPTION_RELWITHDEBINFO:
-            build_type = 'RelWithDebInfo'
         py_executable = sys.executable
         py_version = "%s.%s" % (sys.version_info[0], sys.version_info[1])
         py_include_dir = get_config_var("INCLUDEPY")
diff --git a/utils.py b/utils.py
index eeb5a733a..0c69c34c5 100644
--- a/utils.py
+++ b/utils.py
@@ -64,6 +64,66 @@ def update_env_path(newpaths, logger):
             os.environ['PATH'] = path + os.pathsep + os.environ['PATH']
 
 
+def winsdk_setenv(platform_arch, build_type, logger):
+    from distutils.msvc9compiler import VERSION as MSVC_VERSION
+    from distutils.msvc9compiler import Reg
+    from distutils.msvc9compiler import HKEYS
+    from distutils.msvc9compiler import WINSDK_BASE
+
+    sdk_version_map = {
+        "v6.0a": 9.0,
+        "v6.1": 9.0,
+        "v7.0": 9.0,
+        "v7.0a": 10.0,
+        "v7.1": 10.0
+    }
+
+    logger.info("Searching Windows SDK with MSVC compiler version %s" % MSVC_VERSION)
+    setenv_paths = []
+    for base in HKEYS:
+        sdk_versions = Reg.read_keys(base, WINSDK_BASE)
+        if sdk_versions:
+            for sdk_version in sdk_versions:
+                installationfolder = Reg.get_value(WINSDK_BASE + "\\" +
+                    sdk_version, "installationfolder")
+                productversion = Reg.get_value(WINSDK_BASE + "\\" +
+                    sdk_version, "productversion")
+                setenv_path = os.path.join(installationfolder, os.path.join(
+                    'bin', 'SetEnv.cmd'))
+                if not os.path.exists(setenv_path):
+                    continue
+                if not sdk_version in sdk_version_map:
+                    continue
+                if sdk_version_map[sdk_version] != MSVC_VERSION:
+                    continue
+                setenv_paths.append(setenv_path)
+    if len(setenv_paths) == 0:
+        raise DistutilsSetupError(
+            "Failed to find the Windows SDK with MSVC compiler version %s"
+                % MSVC_VERSION)
+    for setenv_path in setenv_paths:
+        logger.info("Found %s" % setenv_path)
+
+    # Get SDK env (use latest SDK version installed on system)
+    setenv_path = setenv_paths[-1]
+    logger.info("Using %s " % setenv_path)
+    build_arch = "/x86" if platform_arch.startswith("32") else "/x64"
+    build_type = "/Debug" if build_type.lower() == "debug" else "/Release"
+    setenv_cmd = [setenv_path, build_arch, build_type]
+    setenv_env = get_environment_from_batch_command(setenv_cmd)
+    setenv_env_paths = os.pathsep.join([setenv_env[k] for k in setenv_env if k.upper() == 'PATH']).split(os.pathsep)
+    setenv_env_without_paths = dict([(k, setenv_env[k]) for k in setenv_env if k.upper() != 'PATH'])
+
+    # Extend os.environ with SDK env
+    logger.info("Initializing Windows SDK env...")
+    update_env_path(setenv_env_paths, logger)
+    for k in sorted(setenv_env_without_paths):
+        v = setenv_env_without_paths[k]
+        logger.info("Inserting \"%s = %s\" to environment" % (k, v))
+        os.environ[k] = v
+    logger.info("Done initializing Windows SDK env")
+
+
 def find_vcdir(version):
     """
     This is the customized version of distutils.msvc9compiler.find_vcvarsall method
@@ -111,7 +171,7 @@ def find_vcdir(version):
     return productdir
 
 
-def init_msvc_env(platform_arch, logger):
+def init_msvc_env(platform_arch, build_type, logger):
     from distutils.msvc9compiler import VERSION as MSVC_VERSION
 
     logger.info("Searching MSVC compiler version %s" % MSVC_VERSION)
@@ -133,8 +193,11 @@ def init_msvc_env(platform_arch, logger):
                 vcvars_path = os.path.join(vcdir_path, "bin", "amd64", "vcvarsamd64.bat")
 
     if not os.path.exists(vcvars_path):
-        raise DistutilsSetupError(
+        # MSVC init script not found, try to find and init Windows SDK env
+        logger.error(
             "Failed to find the MSVC compiler environment init script (vcvars.bat) on your system.")
+        winsdk_setenv(platform_arch, build_type, logger)
+        return
     else:
         logger.info("Found %s" % vcvars_path)
 
@@ -347,7 +410,7 @@ def get_environment_from_batch_command(env_cmd, initial=None):
     # create a tag so we can tell in the output when the proc is done
     tag = 'Done running command'
     # construct a cmd.exe command to do accomplish this
-    cmd = 'cmd.exe /s /c "{env_cmd} && echo "{tag}" && set"'.format(**vars())
+    cmd = 'cmd.exe /E:ON /V:ON /s /c "{env_cmd} && echo "{tag}" && set"'.format(**vars())
     # launch the process
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, env=initial)
     # parse the output sent to stdout