From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 6 Nov 2008 19:46:56 +0000 (+0000)
Subject: Merged revisions 67125 via svnmerge from
X-Git-Tag: v3.0rc2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9184556668f4243c766275ecdb9d50ef38a527c1;p=python

Merged revisions 67125 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67125 | martin.v.loewis | 2008-11-06 20:46:03 +0100 (Do, 06 Nov 2008) | 2 lines

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

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d30268881a..006269d15f 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -941,10 +941,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.