Commit ddd82636 authored by Martin v. Löwis's avatar Martin v. Löwis

Stop including fake manifest file in DLLs directory.

parent fcdc80bf
...@@ -940,10 +940,12 @@ def add_files(db): ...@@ -940,10 +940,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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment