diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-11-06 19:46:56 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-11-06 19:46:56 (GMT) |
| commit | 9184556668f4243c766275ecdb9d50ef38a527c1 (patch) | |
| tree | feba5dd9446886198f03d887eeba520d075b2c6e /Tools | |
| parent | 900646ef682ff8aaffca0c2294ed9416d5a1947c (diff) | |
| download | cpython-9184556668f4243c766275ecdb9d50ef38a527c1.zip cpython-9184556668f4243c766275ecdb9d50ef38a527c1.tar.gz cpython-9184556668f4243c766275ecdb9d50ef38a527c1.tar.bz2 | |
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.
........
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/msi.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index d302688..006269d 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. |