[Python-3000-checkins] r67127 - in python/branches/py3k: Tools/msi/msi.py
martin.v.loewis
python-3000-checkins at python.org
Thu Nov 6 20:46:56 CET 2008
Author: martin.v.loewis
Date: Thu Nov 6 20:46:56 2008
New Revision: 67127
Log:
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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Tools/msi/msi.py
Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py (original)
+++ python/branches/py3k/Tools/msi/msi.py Thu Nov 6 20:46:56 2008
@@ -941,10 +941,12 @@
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.
More information about the Python-3000-checkins
mailing list