mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make the "private CRT" case work, by editing the

Browse source 
manifest in DLLs to refer to the root copy of the CRT.
This commit is contained in:
Martin v. Löwis 2008-04-07 16:34:04 +00:00
parent 46a8be7a35
commit 1e72feced3
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Tools/msi/msi.py
View file

@ -105,7 +105,6 @@ extensions = [
# Using the same UUID is fine since these files are versioned, # Using the same UUID is fine since these files are versioned,
# so Installer will always keep the newest version. # so Installer will always keep the newest version.
# NOTE: All uuids are self generated. # NOTE: All uuids are self generated.
msvcr90_uuid = "{9C28CD84-397C-4045-855C-28B02291A272}"
pythondll_uuid = { pythondll_uuid = {
"24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}", "24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}",
"25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}", "25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}",
@ -879,11 +878,24 @@ def add_files(db):
version=pyversion, version=pyversion,
language=installer.FileVersion(pydllsrc, 1)) language=installer.FileVersion(pydllsrc, 1))
DLLs = PyDirectory(db, cab, root, srcdir + "/" + PCBUILD, "DLLs", "DLLS|DLLs") DLLs = PyDirectory(db, cab, root, srcdir + "/" + PCBUILD, "DLLs", "DLLS|DLLs")
# msvcr90.dll: Need to place the DLL and the manifest into the root directory,
# plus another copy of the manifest in the DLLs directory, with the manifest
# pointing to the root directory
root.start_component("msvcr90", feature=private_crt) root.start_component("msvcr90", feature=private_crt)
for file, kw in extract_msvcr90(): # Results are ID,keyword pairs
root.add_file(file, **kw) manifest, crtdll = extract_msvcr90()
if file.endswith("manifest"): root.add_file(manifest[0], **manifest[1])
DLLs.add_file(file, **kw) 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))
# Now start the main component for the DLLs directory;
# no regular files have been added to the directory yet.
DLLs.start_component()
# Check if _ctypes.pyd exists # Check if _ctypes.pyd exists
have_ctypes = os.path.exists(srcdir+"/%s/_ctypes.pyd" % PCBUILD) have_ctypes = os.path.exists(srcdir+"/%s/_ctypes.pyd" % PCBUILD)