Skip to content

Commit bfc5ccd

Browse files
committed
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. ........
1 parent e55ab5e commit bfc5ccd

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

Tools/msi/msi.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -939,10 +939,12 @@ def add_files(db):
939939
root.add_file(manifest[0], **manifest[1])
940940
root.add_file(crtdll[0], **crtdll[1])
941941
# Copy the manifest
942-
manifest_dlls = manifest[0]+".root"
943-
open(manifest_dlls, "w").write(open(manifest[1]['src']).read().replace("msvcr","../msvcr"))
944-
DLLs.start_component("msvcr90_dlls", feature=private_crt)
945-
DLLs.add_file(manifest[0], src=os.path.abspath(manifest_dlls))
942+
# Actually, don't do that anymore - no DLL in DLLs should have a manifest
943+
# dependency on msvcr90.dll anymore, so this should not be necessary
944+
#manifest_dlls = manifest[0]+".root"
945+
#open(manifest_dlls, "w").write(open(manifest[1]['src']).read().replace("msvcr","../msvcr"))
946+
#DLLs.start_component("msvcr90_dlls", feature=private_crt)
947+
#DLLs.add_file(manifest[0], src=os.path.abspath(manifest_dlls))
946948

947949
# Now start the main component for the DLLs directory;
948950
# no regular files have been added to the directory yet.

0 commit comments

Comments
 (0)