traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
........
This commit is contained in:
Martin v. Löwis 2008-11-06 19:46:56 +00:00
parent 900646ef68
commit 9184556668
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/msi/msi.py
View File

@ -941,10 +941,12 @@ def add_files(db):
root.add_file(manifest[0], **manifest[1]) root.add_file(manifest[0], **manifest[1])
root.add_file(crtdll[0], **crtdll[1]) root.add_file(crtdll[0], **crtdll[1])
# Copy the manifest # Copy the manifest
manifest_dlls = manifest[0]+".root" # Actually, don't do that anymore - no DLL in DLLs should have a manifest
open(manifest_dlls, "w").write(open(manifest[1]['src']).read().replace("msvcr","../msvcr")) # dependency on msvcr90.dll anymore, so this should not be necessary
DLLs.start_component("msvcr90_dlls", feature=private_crt) #manifest_dlls = manifest[0]+".root"
DLLs.add_file(manifest[0], src=os.path.abspath(manifest_dlls)) #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; # Now start the main component for the DLLs directory;
# no regular files have been added to the directory yet. # no regular files have been added to the directory yet.