From: Thomas Heller <theller@ctypes.org>
Date: Fri, 28 Nov 2003 19:42:56 +0000 (+0000)
Subject: See SF #848614: distutils' msvccompiler now tries to detect that MSVC6
X-Git-Tag: v2.4a1~1191
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3105911697d57098e9770078d89475f83274344;p=thirdparty%2FPython%2Fcpython.git

See SF #848614: distutils' msvccompiler now tries to detect that MSVC6
is installed but the registry settings are incomplete because the gui
has never been run.

Already backported to release23-maint.
---

diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py
index 5f3d8de87232..27fb658b5bb9 100644
--- a/Lib/distutils/msvccompiler.py
+++ b/Lib/distutils/msvccompiler.py
@@ -547,6 +547,16 @@ class MSVCCompiler (CCompiler) :
                     return string.split(self.__macros.sub(d[path]), ";")
                 else:
                     return string.split(d[path], ";")
+        # MSVC 6 seems to create the registry entries we need only when
+        # the GUI is run.
+        if self.__version == 6:
+            for base in HKEYS:
+                if read_values(base, r"%s\6.0" % self.__root) is not None:
+                    self.warn("It seems you have Visual Studio 6 installed, "
+                        "but the expected registry settings are not present.\n"
+                        "You must at least run the Visual Studio GUI once "
+                        "so that these entries are created.")
+                break
         return []
 
     def set_path_env_var(self, name):
diff --git a/Misc/NEWS b/Misc/NEWS
index c523e65f7ae5..8097a03a450e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -146,6 +146,9 @@ Extension modules
 Library
 -------
 
+- Bug #848614: distutils' msvccompiler fails to find the MSVC6
+  compiler because of incomplete registry entries.
+
 - httplib.HTTP.putrequest now offers to omit the implicit Accept-Encoding.
 
 - Patch #841977: modulefinder didn't find extension modules in packages