From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 6 Nov 2008 19:46:03 +0000 (+0000)
Subject: Stop including fake manifest file in DLLs directory.
X-Git-Tag: v2.7a1~2677
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd8263678a87b9f710ae52fd6c367d87e4cb81d;p=thirdparty%2FPython%2Fcpython.git

Stop including fake manifest file in DLLs directory.
---

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 517c4765aad6..6b83bfb3af86 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -940,10 +940,12 @@ def add_files(db):
     root.add_file(manifest[0], **manifest[1])
     root.add_file(crtdll[0], **crtdll[1])
     # Copy the manifest
-    manifest_dlls = manifest[0]+".root"
-    open(manifest_dlls, "w").write(open(manifest[1]['src']).read().replace("msvcr","../msvcr"))
-    DLLs.start_component("msvcr90_dlls", feature=private_crt)
-    DLLs.add_file(manifest[0], src=os.path.abspath(manifest_dlls))
+    # Actually, don't do that anymore - no DLL in DLLs should have a manifest
+    # dependency on msvcr90.dll anymore, so this should not be necessary
+    #manifest_dlls = manifest[0]+".root"
+    #open(manifest_dlls, "w").write(open(manifest[1]['src']).read().replace("msvcr","../msvcr"))
+    #DLLs.start_component("msvcr90_dlls", feature=private_crt)
+    #DLLs.add_file(manifest[0], src=os.path.abspath(manifest_dlls))
 
     # Now start the main component for the DLLs directory;
     # no regular files have been added to the directory yet.