Support for Visual Studio 2008 build tools in automate.py.

cztomczak · cztomczak · commit e0bdca3d246d · 2018-08-14T10:18:47.000+02:00
Previously only Visual C++ for Python 2.7 was supported.
diff --git a/tools/build.py b/tools/build.py
@@ -469,6 +469,12 @@ def build_vcproj_DEPRECATED(vcproj):
     # msbuild /p:BuildProjectReferences=false project.proj
     # MSBuild.exe MyProject.proj /t:build
 
+    VS2008_BUILD = ("%LocalAppData%\\Programs\\Common\\"
+                    "Microsoft\\Visual C++ for Python\\9.0\\"
+                    "VC\\bin\\amd64\\vcbuild.exe")
+    VS2008_BUILD = VS2008_BUILD.replace("%LocalAppData%",
+                                        os.environ["LOCALAPPDATA"])
+
     if PYVERSION == "27":
         args = list()
         args.append(VS2008_VCVARS)
diff --git a/tools/common.py b/tools/common.py
@@ -191,30 +191,28 @@
 SUBPROCESS_EXE = os.path.join(BUILD_SUBPROCESS,
                               "subprocess" + EXECUTABLE_EXT)
 
-# Visual Studio constants
+# These Visual Studio constants are used by automate.py tool
+# to build upstream C++ projects. CEF Python C++ code is built
+# with setuptools/distutils in the build_cpp_projects.py tool.
+# -----------------------------------------------------------------------------
+
 VS_PLATFORM_ARG = "x86" if ARCH32 else "amd64"
 
 VS2015_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 14.0"
                  "\\VC\\vcvarsall.bat")
 
-# For CEF build
 VS2013_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 12.0"
                  "\\VC\\vcvarsall.bat")
 
-# VS2010 vcvarsall not used, using detection with setuptools instead
 VS2010_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 10.0"
                  "\\VC\\vcvarsall.bat")
 
-VS2008_VCVARS = ("%LocalAppData%\\Programs\\Common\\Microsoft"
-                 "\\Visual C++ for Python\\9.0\\vcvarsall.bat")
-VS2008_BUILD = ("%LocalAppData%\\Programs\\Common\\"
-                "Microsoft\\Visual C++ for Python\\9.0\\"
-                "VC\\bin\\amd64\\vcbuild.exe")
-if "LOCALAPPDATA" in os.environ:
-    VS2008_VCVARS = VS2008_VCVARS.replace("%LocalAppData%",
-                                          os.environ["LOCALAPPDATA"])
-    VS2008_BUILD = VS2008_BUILD.replace("%LocalAppData%",
-                                        os.environ["LOCALAPPDATA"])
+VS2008_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 9.0"
+                 "\\VC\\vcvarsall.bat")
+
+if not os.path.exists(VS2008_VCVARS):
+    VS2008_VCVARS = (os.environ["LOCALAPPDATA"]+"\\Programs\\Common\\Microsoft"
+                     "\\Visual C++ for Python\\9.0\\vcvarsall.bat")
 
 # -----------------------------------------------------------------------------
 
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
@@ -127,11 +127,15 @@ def get_winsdk_lib():
             winsdk_libs = [
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib",
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib",
+                # Visual Studio 2008 installation
+                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib",
             ]
         elif ARCH64:
             winsdk_libs = [
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib\\x64",
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib\\x64",
+                # Visual Studio 2008 installation
+                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib\\x64",
             ]
         else:
             raise Exception("Unknown architecture")
