MSVC build environment.

.gitignore

@@ -8,6 +8,11 @@
 wingdbstub.py*
 mydbstub.py*
 
+# temporary storage location for modules
+# that are needed when setting up a build
+# environment in Windows
+.eggs
+
 .idea
 .cache
 .vagrant

build.py

@@ -785,37 +785,47 @@ def uploadTree(srcPath, destPath, options, days=30):
 
 def checkCompiler(quiet=False):
     if isWindows:
-        # Make sure that the compiler that Python wants to use can be found.
-        # It will terminate if the compiler is not found or other exceptions
-        # are raised.
-        cmd = "import setuptools, distutils.msvc9compiler as msvc; " \
-              "mc = msvc.MSVCCompiler(); " \
-              "mc.initialize(); " \
-              "print(mc.cc)"
-        CC = runcmd('"%s" -c "%s"' % (PYTHON, cmd), getOutput=True, echoCmd=False)
+        from buildtools import msvc
+
+        # setup the build environment making the minimum conpiler version 14.2
+        # A user does not need to have a full blown Visual Studio installation
+        # in order to build wxPython. They can use Visual Studio Build Tools
+        # as well. Build Tools doe not include any of the GUI replated
+        # components of Visual Studio.
+        # If the msvc script isunable to locate an MSVC compiler that is of
+        # version >= 14.2 the msvc script will raise RuntimeError.
+
+        # the msvc script works in a manner where no part of either setuptools
+        # or distutils is overriden. It uses mechanics that can alter what
+        # setuptools and distutils sees and uses for the build environment
+        # without tampering with any of the original code in those libraries.
+
+        # the msvc script does not use the problematic vcvars*.bat files that
+        # come with an MSVC compiler. It builds the environment from the ground
+        # up by reading the registry and using the COM interfaces. The
+        # subprocess module is only used for Visual Studio  installatons that
+        # are older then 2017 which  wouldn't be an issue because the wxPython
+        # build system needs the MSVC compiler to be at least 14.2 (VS 2019)
+
+        # If the environment variable "DISTUTILS_DEBUG=1" is set There is
+        # going to be a HUGE dump of information from the msvc module to
+        # stdout by way of distutils.log.debug(). If the logging level is set
+        # to DEBUG by using distutils.log.set_threshold(distutils.log.DEBUG)
+        # or any other mechanics to set the logging level to DEBUG here will
+        # be a heap of information dumped to stdout by the msvc module.
+
+        # Just so this is on record and can be used at a later date if needs
+        # be the MSVC compiler defaults to c++11. If you need to change this
+        # extra compiler arguments will have to be added, "/std:cpp_version"
+        # where cpp_version is the version of cpp to be used ie: "c++20".
+        # The __cplusplus macro does not change when using the /std compiler
+        # switch. You have to specifically tell the compuler to update the
+        # value for the __cplusplus macro using "/Zc:__cplusplus"
+        environment = msvc.setup_environment(minimum_c_version=14.2)
+
         if not quiet:
-            msg("MSVC: %s" % CC)
-
-        # Now get the environment variables which that compiler needs from
-        # its vcvarsall.bat command and load them into this process's
-        # environment.
-        cmd = "import setuptools, distutils.msvc9compiler as msvc; " \
-              "arch = msvc.PLAT_TO_VCVARS[msvc.get_platform()]; " \
-              "env = msvc.query_vcvarsall(msvc.VERSION, arch); " \
-              "print(env)"
-        env = eval(runcmd('"%s" -c "%s"' % (PYTHON, cmd), getOutput=True, echoCmd=False))
-
-        def _b(v):
-            return str(v)
-            #if PY2:
-            #    return bytes(v)
-            #else:
-            #    return bytes(v, 'utf8')
-
-        os.environ['PATH'] = _b(env['path'])
-        os.environ['INCLUDE'] = _b(env['include'])
-        os.environ['LIB'] = _b(env['lib'])
-        os.environ['LIBPATH'] = _b(env['libpath'])
+            # this gives a simple output of the build environment.
+            print(environment)
 
     # NOTE: SIP is now generating code with scoped-enums. Older linux
     # platforms like what we're using for builds, and also TravisCI for
@@ -849,6 +859,31 @@ def getWafBuildBase():
 def getBashPath():
     """Check if there is a bash.exe on the PATH"""
     bash = which('bash.exe')
+
+    if not bash and isWindows:
+        import winreg
+
+        try:
+            handle = winreg.OpenKeyEx(
+                winreg.HKEY_LOCAL_MACHINE,
+                r'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Git_is1'
+            )
+        except winreg.error:
+            pass
+        else:
+            try:
+                path = winreg.QueryValueEx(handle, "InstallLocation")[0]
+                winreg.CloseKey(handle)
+                path = os.path.join(path, 'bin', 'bash.exe')
+
+                if os.path.exists(path):
+                    bash = path
+
+            except winreg.error:
+                pass
+
+            winreg.CloseKey(handle)
+
     return bash
 
 

buildtools/build_wxwidgets.py

@@ -478,12 +478,27 @@ def main(wxDir, args):
                     "CPPFLAGS=/I%s" %
                      os.path.join(os.environ.get("CAIRO_ROOT", ""), 'include\\cairo'))
 
-            if options.jom:
-                nmakeCommand = 'jom.exe'
-
             if options.no_dpi_aware:
                 args.append("USE_DPI_AWARE_MANIFEST=0")
 
+            if options.jom:
+                nmakeCommand = 'jom.exe'
+            else:
+                from . import msvc
+                environment = msvc.setup_environment(minimum_c_version=14.2)
+
+                if (
+                    environment.visual_c.has_cmake and
+                    environment.visual_c.has_ninja
+                ):
+                    args.pop(0)
+                    for i, arg in enumerate(args[:]):
+                        args[i] = '-D' + arg
+                    buildDir = wxRootDir
+                    nmakeCommand = 'cmake.exe'
+                    os.environ['INCLUDE'] += (
+                        ';' + os.path.join(wxRootDir, 'include', 'msvc')
+                    )
 
             wxBuilder = builder.MSVCBuilder(commandName=nmakeCommand)
 
@@ -511,10 +526,18 @@ def main(wxDir, args):
     if options.extra_make:
         args.append(options.extra_make)
 
-    if not sys.platform.startswith("win"):
+    if sys.platform.startswith("win"):
+        if nmakeCommand.startswith('cmake'):
+            args.insert(0, '-GNinja')
+    else:
         args.append("--jobs=" + options.jobs)
+
     exitIfError(wxBuilder.build(dir=buildDir, options=args), "Error building")
 
+    if sys.platform.startswith("win") and nmakeCommand.startswith('cmake'):
+        wxBuilder = builder.MSVCBuilder(commandName='ninja.exe')
+        exitIfError(wxBuilder.build(dir=buildDir, options=['-j ' + options.jobs]), "Error building")
+
     if options.install:
         extra=None
         if installDir: