Merged revisions 72891 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72891 | martin.v.loewis | 2009-05-24 21:10:52 +0200 (So, 24 Mai 2009) | 5 lines

  Issue #6065: Do not try to build a version-independent
  installer if the package has extension modules.

  Also add NEWS entry for #5311.
........

diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py
index 96451586370a7c66f04e371e14920b22b97f179b..bca98cc23ea9e3776339519a2da36e2bd7f4cb0b 100644 (file)
--- a/Lib/distutils/command/bdist_msi.py
+++ b/Lib/distutils/command/bdist_msi.py
@@ -141,6 +141,8 @@ class bdist_msi(Command):
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'msi')
         short_version = get_python_version()
+        if (not self.target_version) and self.distribution.has_ext_modules():
+            self.target_version = short_version
         if self.target_version:
             self.versions = [self.target_version]
             if not self.skip_build and self.distribution.has_ext_modules()\

diff --git a/Misc/NEWS b/Misc/NEWS
index 110efbeb77d4aef1c1681e108bbbb27e2763063f..76f877308354dcbe97658b1645b282840952bb6b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -230,6 +230,9 @@ Installation
 Library
 -------
 
+- Issue #5311: bdist_msi can now build packages that do not depend on a
+  specific Python version.
+
 - Issue #5940: distutils.command.build_clib.check_library_list was not doing 
   the right type checkings anymore.