summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-11-06 19:46:46 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-11-06 19:46:46 (GMT)
commitbfc5ccd5a10c86c418a786eab034c6ddde62794f (patch)
tree7d9e2e52457f90fc73b98ddc9216bc628dc34212 /Tools
parente55ab5e625c3ac05c389603e59cb837f75f6cd8f (diff)
downloadcpython-bfc5ccd5a10c86c418a786eab034c6ddde62794f.zip
cpython-bfc5ccd5a10c86c418a786eab034c6ddde62794f.tar.gz
cpython-bfc5ccd5a10c86c418a786eab034c6ddde62794f.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.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 87f918a..0614cc2 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -939,10 +939,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.