summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2009-12-03 20:57:49 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2009-12-03 20:57:49 (GMT)
commit1679ea849b1b7c87d6977cdfe5647c1bbf4489f3 (patch)
treef5c50a03c0ef7c91b41d9f89f17a24be8d4dae02
parent71f09487fcda7d010cb5fb9d120be41f7f325bdc (diff)
downloadcpython-1679ea849b1b7c87d6977cdfe5647c1bbf4489f3.zip
cpython-1679ea849b1b7c87d6977cdfe5647c1bbf4489f3.tar.gz
cpython-1679ea849b1b7c87d6977cdfe5647c1bbf4489f3.tar.bz2
Merged revisions 76651 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76651 | martin.v.loewis | 2009-12-03 21:53:51 +0100 (Do, 03 Dez 2009) | 3 lines Issue #4120: Drop reference to CRT from manifest when building extensions with msvc9compiler. ........
-rw-r--r--Lib/distutils/msvc9compiler.py23
-rw-r--r--Misc/NEWS3
2 files changed, 26 insertions, 0 deletions
diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py
index ef89542..c84fb0b 100644
--- a/Lib/distutils/msvc9compiler.py
+++ b/Lib/distutils/msvc9compiler.py
@@ -17,6 +17,7 @@ __revision__ = "$Id$"
import os
import subprocess
import sys
+import re
from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
CompileError, LibError, LinkError
@@ -645,6 +646,28 @@ class MSVCCompiler(CCompiler) :
mfid = 1
else:
mfid = 2
+ try:
+ # Remove references to the Visual C runtime, so they will
+ # fall through to the Visual C dependency of Python.exe.
+ # This way, when installed for a restricted user (e.g.
+ # runtimes are not in WinSxS folder, but in Python's own
+ # folder), the runtimes do not need to be in every folder
+ # with .pyd's.
+ manifest_f = open(temp_manifest, "rb")
+ manifest_buf = manifest_f.read()
+ manifest_f.close()
+ pattern = re.compile(
+ r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
+ r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
+ re.DOTALL)
+ manifest_buf = re.sub(pattern, "", manifest_buf)
+ pattern = "<dependentAssembly>\s*</dependentAssembly>"
+ manifest_buf = re.sub(pattern, "", manifest_buf)
+ manifest_f = open(temp_manifest, "wb")
+ manifest_f.write(manifest_buf)
+ manifest_f.close()
+ except IOError:
+ pass
out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
try:
self.spawn(['mt.exe', '-nologo', '-manifest',
diff --git a/Misc/NEWS b/Misc/NEWS
index 6a216ed4..fa881c9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -154,6 +154,9 @@ C-API
Library
-------
+- Issue #4120: Drop reference to CRT from manifest when building extensions with
+ msvc9compiler.
+
- Issue #7333: The `posix` module gains an `initgroups()` function providing
access to the initgroups(3) C library call on Unix systems which implement
it. Patch by Jean-Paul Calderone.