[WIP] MSVC: detection fixes and changes

SCons/Tool/MSCommon/MSVC/Registry.py

@@ -110,6 +110,9 @@ def windows_kit_query_paths(version):
     q = windows_kits(version)
     return microsoft_query_paths(q)
 
+def vstudio_sxs_vs7(version):
+    return '\\'.join([r'VisualStudio\SxS\VS7', version])
+
 def vstudio_sxs_vc7(version):
     return '\\'.join([r'VisualStudio\SxS\VC7', version])
 

SCons/Tool/MSCommon/MSVC/ScriptArguments.py

@@ -42,6 +42,7 @@
 from . import Config
 from . import Registry
 from . import WinSDK
+from . import Kind
 
 from .Exceptions import (
     MSVCInternalError,
@@ -196,7 +197,7 @@ def _toolset_version(version):
 
     return version_args
 
-def _msvc_script_argument_uwp(env, msvc, arglist):
+def _msvc_script_argument_uwp(env, msvc, arglist, target_arch):
 
     uwp_app = env['MSVC_UWP_APP']
     debug('MSVC_VERSION=%s, MSVC_UWP_APP=%s', repr(msvc.version), repr(uwp_app))
@@ -218,6 +219,23 @@ def _msvc_script_argument_uwp(env, msvc, arglist):
         )
         raise MSVCArgumentError(err_msg)
 
+    is_supported, is_target = Kind.msvc_version_uwp_is_supported(msvc.version, target_arch, env)
+    if not is_supported:
+        _, kind_str = Kind.get_msvc_version_kind(msvc.version)
+        debug(
+            'invalid: msvc_version constraint: %s %s %s',
+            repr(msvc.version), repr(kind_str), repr(target_arch)
+        )
+        if is_target and target_arch:
+            err_msg = "MSVC_UWP_APP ({}) TARGET_ARCH ({}) is not supported for MSVC_VERSION {} ({})".format(
+                repr(uwp_app), repr(target_arch), repr(msvc.version), repr(kind_str)
+            )
+        else:
+            err_msg = "MSVC_UWP_APP ({}) is not supported for MSVC_VERSION {} ({})".format(
+                repr(uwp_app), repr(msvc.version), repr(kind_str)
+            )
+        raise MSVCArgumentError(err_msg)
+
     # VS2017+ rewrites uwp => store for 14.0 toolset
     uwp_arg = msvc.vs_def.vc_uwp
 
@@ -250,7 +268,7 @@ def _user_script_argument_uwp(env, uwp, user_argstr) -> bool:
 
     raise MSVCArgumentError(err_msg)
 
-def _msvc_script_argument_sdk_constraints(msvc, sdk_version):
+def _msvc_script_argument_sdk_constraints(msvc, sdk_version, env):
 
     if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2015.vc_buildtools_def.vc_version_numeric:
         debug(
@@ -263,6 +281,14 @@ def _msvc_script_argument_sdk_constraints(msvc, sdk_version):
         )
         return err_msg
 
+    if not Kind.msvc_version_sdk_version_is_supported(msvc.version, env):
+        _, kind_str = Kind.get_msvc_version_kind(msvc.version)
+        debug('invalid: msvc_version constraint: %s %s', repr(msvc.version), repr(kind_str))
+        err_msg = "MSVC_SDK_VERSION ({}) is not supported for MSVC_VERSION {} ({})".format(
+            repr(sdk_version), repr(msvc.version), repr(kind_str)
+        )
+        return err_msg
+
     for msvc_sdk_version in msvc.vs_def.vc_sdk_versions:
         re_sdk_version = re_sdk_dispatch_map[msvc_sdk_version]
         if re_sdk_version.match(sdk_version):
@@ -310,7 +336,7 @@ def _msvc_script_argument_sdk(env, msvc, toolset, platform_def, arglist):
     if not sdk_version:
         return None
 
-    err_msg = _msvc_script_argument_sdk_constraints(msvc, sdk_version)
+    err_msg = _msvc_script_argument_sdk_constraints(msvc, sdk_version, env)
     if err_msg:
         raise MSVCArgumentError(err_msg)
 
@@ -336,6 +362,9 @@ def _msvc_script_default_sdk(env, msvc, platform_def, arglist, force_sdk: bool=F
     if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2015.vc_buildtools_def.vc_version_numeric:
         return None
 
+    if not Kind.msvc_version_sdk_version_is_supported(msvc.version, env):
+        return None
+
     sdk_list = WinSDK.get_sdk_version_list(msvc.vs_def, platform_def)
     if not len(sdk_list):
         return None
@@ -873,7 +902,18 @@ def _msvc_process_construction_variables(env) -> bool:
 
     return False
 
-def msvc_script_arguments(env, version, vc_dir, arg):
+def msvc_script_arguments_has_uwp(env):
+
+    if not _msvc_process_construction_variables(env):
+        return False
+
+    uwp_app = env.get('MSVC_UWP_APP')
+    is_uwp = bool(uwp_app and uwp_app in _ARGUMENT_BOOLEAN_TRUE_LEGACY)
+
+    debug('is_uwp=%s', is_uwp)
+    return is_uwp
+
+def msvc_script_arguments(env, version, vc_dir, arg=None):
 
     arguments = [arg] if arg else []
 
@@ -889,10 +929,12 @@ def msvc_script_arguments(env, version, vc_dir, arg):
 
     if _msvc_process_construction_variables(env):
 
+        target_arch = env.get('TARGET_ARCH')
+
         # MSVC_UWP_APP
 
         if 'MSVC_UWP_APP' in env:
-            uwp = _msvc_script_argument_uwp(env, msvc, arglist)
+            uwp = _msvc_script_argument_uwp(env, msvc, arglist, target_arch)
         else:
             uwp = None
 

SCons/Tool/MSCommon/MSVC/ScriptArgumentsTests.py

@@ -36,6 +36,10 @@
 from SCons.Tool.MSCommon.MSVC import Util
 from SCons.Tool.MSCommon.MSVC import WinSDK
 from SCons.Tool.MSCommon.MSVC import ScriptArguments
+from SCons.Tool.MSCommon.MSVC.Kind import (
+    msvc_version_is_express,
+    msvc_version_is_btdispatch,
+)
 
 from SCons.Tool.MSCommon.MSVC.Exceptions import (
     MSVCInternalError,
@@ -127,7 +131,7 @@ class Data:
 
     for vcver in Config.MSVC_VERSION_SUFFIX.keys():
         version_def = Util.msvc_version_components(vcver)
-        vc_dir = vc.find_vc_pdir(None, vcver)
+        vc_dir = vc.find_vc_pdir(vcver)
         t = (version_def, vc_dir)
         ALL_VERSIONS_PAIRS.append(t)
         if vc_dir:
@@ -229,7 +233,13 @@ def test_msvc_script_arguments_defaults(self) -> None:
         for version_def, vc_dir in Data.INSTALLED_VERSIONS_PAIRS:
             for arg in ('', 'arch'):
                 scriptargs = func(env, version_def.msvc_version, vc_dir, arg)
-                if version_def.msvc_vernum >= 14.0:
+                sdk_supported = True
+                if version_def.msvc_verstr == '14.0':
+                    if msvc_version_is_express(version_def.msvc_version):
+                        sdk_supported = False
+                    elif msvc_version_is_btdispatch(version_def.msvc_version):
+                        sdk_supported = False
+                if version_def.msvc_vernum >= 14.0 and sdk_supported:
                     if arg and scriptargs.startswith(arg):
                         testargs = scriptargs[len(arg):].lstrip()
                     else:
@@ -289,7 +299,7 @@ def run_msvc_script_args_none(self) -> None:
                 {'MSVC_SCRIPT_ARGS': None, 'MSVC_SPECTRE_LIBS': None},
             ]:
                 env = Environment(**kwargs)
-                _ = func(env, version_def.msvc_version, vc_dir, '')
+                _ = func(env, version_def.msvc_version, vc_dir)
 
     def run_msvc_script_args(self) -> None:
         func = ScriptArguments.msvc_script_arguments
@@ -312,7 +322,7 @@ def run_msvc_script_args(self) -> None:
 
                 # should not raise exception (argument not validated)
                 env = Environment(MSVC_SCRIPT_ARGS='undefinedsymbol')
-                _ = func(env, version_def.msvc_version, vc_dir, '')
+                _ = func(env, version_def.msvc_version, vc_dir)
 
                 for kwargs in [
                     {'MSVC_UWP_APP': False, 'MSVC_SCRIPT_ARGS': None},
@@ -323,7 +333,7 @@ def run_msvc_script_args(self) -> None:
                     {'MSVC_SPECTRE_LIBS': 'True', 'MSVC_SCRIPT_ARGS': '-vcvars_spectre_libs=spectre'}, # not boolean ignored
                 ]:
                     env = Environment(**kwargs)
-                    _ = func(env, version_def.msvc_version, vc_dir, '')
+                    _ = func(env, version_def.msvc_version, vc_dir)
 
                 for msvc_uwp_app in (True, False):
 
@@ -368,9 +378,9 @@ def run_msvc_script_args(self) -> None:
                                 env = Environment(**kwargs)
                                 if exc:
                                     with self.assertRaises(MSVCArgumentError):
-                                        _ = func(env, version_def.msvc_version, vc_dir, '')
+                                        _ = func(env, version_def.msvc_version, vc_dir)
                                 else:
-                                    _ = func(env, version_def.msvc_version, vc_dir, '')
+                                    _ = func(env, version_def.msvc_version, vc_dir)
 
                         else:
 
@@ -379,14 +389,14 @@ def run_msvc_script_args(self) -> None:
                                 {'MSVC_SDK_VERSION': sdk_def.sdk_version, 'MSVC_UWP_APP': msvc_uwp_app},
                             ]:
                                 env = Environment(**kwargs)
-                                _ = func(env, version_def.msvc_version, vc_dir, '')
+                                _ = func(env, version_def.msvc_version, vc_dir)
 
                 for kwargs in [
                     {'MSVC_SCRIPT_ARGS': '-vcvars_ver={}'.format(version_def.msvc_verstr)},
                     {'MSVC_TOOLSET_VERSION': version_def.msvc_verstr},
                 ]:
                     env = Environment(**kwargs)
-                    _ = func(env, version_def.msvc_version, vc_dir, '')
+                    _ = func(env, version_def.msvc_version, vc_dir)
 
                 msvc_toolset_notfound_version = Data.msvc_toolset_notfound_version(version_def.msvc_version)
 
@@ -398,7 +408,7 @@ def run_msvc_script_args(self) -> None:
                 ]:
                     env = Environment(**kwargs)
                     with self.assertRaises(MSVCToolsetVersionNotFound):
-                        _ = func(env, version_def.msvc_version, vc_dir, '')
+                        _ = func(env, version_def.msvc_version, vc_dir)
 
                 msvc_sdk_notfound_version = Data.msvc_sdk_notfound_version(version_def.msvc_version)
 
@@ -407,15 +417,15 @@ def run_msvc_script_args(self) -> None:
                 ]:
                     env = Environment(**kwargs)
                     with self.assertRaises(MSVCSDKVersionNotFound):
-                        _ = func(env, version_def.msvc_version, vc_dir, '')
+                        _ = func(env, version_def.msvc_version, vc_dir)
 
                 have_spectre = toolset_def.msvc_toolset_version in Data.SPECTRE_TOOLSET_VERSIONS.get(version_def.msvc_version,[])
                 env = Environment(MSVC_SPECTRE_LIBS=True, MSVC_TOOLSET_VERSION=toolset_def.msvc_toolset_version)
                 if not have_spectre:
                     with self.assertRaises(MSVCSpectreLibsNotFound):
-                        _ = func(env, version_def.msvc_version, vc_dir, '')
+                        _ = func(env, version_def.msvc_version, vc_dir)
                 else:
-                    _ = func(env, version_def.msvc_version, vc_dir, '')
+                    _ = func(env, version_def.msvc_version, vc_dir)
 
                 msvc_sdk_version = Data.msvc_sdk_version(version_def.msvc_version)
 
@@ -519,40 +529,105 @@ def run_msvc_script_args(self) -> None:
                 ] + more_tests:
                     env = Environment(**kwargs)
                     with self.assertRaises(exc_t):
-                        _ = func(env, version_def.msvc_version, vc_dir, '')
+                        _ = func(env, version_def.msvc_version, vc_dir)
 
             elif version_def.msvc_verstr == '14.0':
-                # VS2015: MSVC_SDK_VERSION and MSVC_UWP_APP
+
+                if msvc_version_is_express(version_def.msvc_version):
+                    sdk_supported = False
+                    uwp_supported = True  # based on target arch
+                elif msvc_version_is_btdispatch(version_def.msvc_version):
+                    sdk_supported = False
+                    uwp_supported = False
+                else:
+                    sdk_supported = True
+                    uwp_supported = True
 
                 env = Environment(MSVC_SCRIPT_ARGS='undefinedsymbol')
-                _ = func(env, version_def.msvc_version, vc_dir, '')
+                _ = func(env, version_def.msvc_version, vc_dir)
 
-                for msvc_uwp_app in (True, False):
+                if sdk_supported:
+                    # VS2015: MSVC_SDK_VERSION
+
+                    if uwp_supported:
+                        # VS2015: MSVC_UWP_APP
+
+                        for msvc_uwp_app in (True, False):
+
+                            sdk_list = WinSDK.get_msvc_sdk_version_list(version_def.msvc_version, msvc_uwp_app=msvc_uwp_app)
+                            for sdk_version in sdk_list:
+
+                                for kwargs in [
+                                    {'MSVC_SCRIPT_ARGS': sdk_version, 'MSVC_UWP_APP': msvc_uwp_app},
+                                    {'MSVC_SDK_VERSION': sdk_version, 'MSVC_UWP_APP': msvc_uwp_app},
+                                ]:
+                                    env = Environment(**kwargs)
+                                    _ = func(env, version_def.msvc_version, vc_dir)
+
+                    else:
+                        # VS2015: MSVC_UWP_APP error
+
+                        for msvc_uwp_app in (True,):
+
+                            sdk_list = WinSDK.get_msvc_sdk_version_list(version_def.msvc_version, msvc_uwp_app=msvc_uwp_app)
+                            for sdk_version in sdk_list:
+
+                                for kwargs in [
+                                    {'MSVC_SCRIPT_ARGS': sdk_version, 'MSVC_UWP_APP': msvc_uwp_app},
+                                    {'MSVC_SDK_VERSION': sdk_version, 'MSVC_UWP_APP': msvc_uwp_app},
+                                ]:
+                                    env = Environment(**kwargs)
+                                    with self.assertRaises(MSVCArgumentError):
+                                        _ = func(env, version_def.msvc_version, vc_dir)
+
+                else:
+                    # VS2015: MSVC_SDK_VERSION error
 
                     sdk_list = WinSDK.get_msvc_sdk_version_list(version_def.msvc_version, msvc_uwp_app=msvc_uwp_app)
                     for sdk_version in sdk_list:
 
-                        for kwargs in [
-                            {'MSVC_SCRIPT_ARGS': sdk_version, 'MSVC_UWP_APP': msvc_uwp_app},
-                            {'MSVC_SDK_VERSION': sdk_version, 'MSVC_UWP_APP': msvc_uwp_app},
-                        ]:
-                            env = Environment(**kwargs)
-                            _ = func(env, version_def.msvc_version, vc_dir, '')
+                        env = Environment(MSVC_SDK_VERSION=sdk_version)
+                        with self.assertRaises(MSVCArgumentError):
+                            _ = func(env, version_def.msvc_version, vc_dir)
+
+                        # MSVC_SCRIPT_ARGS sdk_version not validated
+                        env = Environment(MSVC_SCRIPT_ARGS=sdk_version)
+                        _ = func(env, version_def.msvc_version, vc_dir)
+
+                    if uwp_supported:
+                        # VS2015: MSVC_UWP_APP
+
+                        for msvc_uwp_app in (True, False):
+                            env = Environment(MSVC_UWP_APP=msvc_uwp_app)
+                            _ = func(env, version_def.msvc_version, vc_dir)
+
+                    else:
+                        # VS2015: MSVC_UWP_APP error
+
+                        for msvc_uwp_app in (True,):
+
+                            env = Environment(MSVC_UWP_APP=msvc_uwp_app)
+                            with self.assertRaises(MSVCArgumentError):
+                                _ = func(env, version_def.msvc_version, vc_dir)
+
+                # MSVC_SCRIPT_ARGS store not validated
+                env = Environment(MSVC_SCRIPT_ARGS='store')
+                _ = func(env, version_def.msvc_version, vc_dir)
 
                 for kwargs in [
                     {'MSVC_SPECTRE_LIBS': True, 'MSVC_SCRIPT_ARGS': None},
                     {'MSVC_TOOLSET_VERSION': version_def.msvc_verstr, 'MSVC_SCRIPT_ARGS': None},
                 ]:
                     env = Environment(**kwargs)
                     with self.assertRaises(MSVCArgumentError):
-                        _ = func(env, version_def.msvc_version, vc_dir, '')
+                        _ = func(env, version_def.msvc_version, vc_dir)
 
             else:
                 # VS2013 and earlier: no arguments
 
                 env = Environment(MSVC_SCRIPT_ARGS='undefinedsymbol')
                 with self.assertRaises(MSVCArgumentError):
-                    _ = func(env, version_def.msvc_version, vc_dir, '')
+                    _ = func(env, version_def.msvc_version, vc_dir)
 
                 for kwargs in [
                     {'MSVC_UWP_APP': True, 'MSVC_SCRIPT_ARGS': None},
@@ -563,7 +638,7 @@ def run_msvc_script_args(self) -> None:
                 ]:
                     env = Environment(**kwargs)
                     with self.assertRaises(MSVCArgumentError):
-                        _ = func(env, version_def.msvc_version, vc_dir, '')
+                        _ = func(env, version_def.msvc_version, vc_dir)
 
     def test_msvc_script_args_none(self) -> None:
         force = ScriptArguments.msvc_force_default_arguments(force=False)