diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-11-06 19:46:03 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-11-06 19:46:03 (GMT) |
| commit | ddd8263678a87b9f710ae52fd6c367d87e4cb81d (patch) | |
| tree | 36ead89df4ce513b762b84bf215f87643f4455b2 /Tools | |
| parent | fcdc80bfd25cae437dcc28ebc9240b0e49efc5aa (diff) | |
| download | cpython-ddd8263678a87b9f710ae52fd6c367d87e4cb81d.zip cpython-ddd8263678a87b9f710ae52fd6c367d87e4cb81d.tar.gz cpython-ddd8263678a87b9f710ae52fd6c367d87e4cb81d.tar.bz2 | |
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 517c476..6b83bfb 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. |