diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-04-05 15:48:36 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-04-05 15:48:36 (GMT) |
| commit | 4dc3415def030a5c52e6a98e780f21653fa537bd (patch) | |
| tree | 12a80adb818c7ded2cd058773f38adcc2dba3342 | |
| parent | 5f187fba3105b2eabdd7997596bbe95a7022d988 (diff) | |
| download | cpython-4dc3415def030a5c52e6a98e780f21653fa537bd.zip cpython-4dc3415def030a5c52e6a98e780f21653fa537bd.tar.gz cpython-4dc3415def030a5c52e6a98e780f21653fa537bd.tar.bz2 | |
Add two features to distinguish between private and SxS CRT.
| -rw-r--r-- | Tools/msi/msi.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 03c07f3..7414564 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -798,6 +798,12 @@ def add_features(db): default_feature = Feature(db, "DefaultFeature", "Python", "Python Interpreter and Libraries", 1, directory = "TARGETDIR") + shared_crt = Feature(db, "SharedCRT", "MSVCRT", "C Run-Time (system-wide)", 0, + level=0) + private_crt = Feature(db, "PrivateCRT", "MSVCRT", "C Run-Time (private)", 0, + level=0) + add_data(db, "Condition", [("SharedCRT", 1, sys32cond), + ("PrivateCRT", 1, "not "+sys32cond)]) # We don't support advertisement of extensions ext_feature = Feature(db, "Extensions", "Register Extensions", "Make this Python installation the default Python installation", 3, @@ -898,7 +904,7 @@ def add_files(db): DLLs = PyDirectory(db, cab, root, srcdir + "/" + PCBUILD, "DLLs", "DLLS|DLLs") # XXX determine dependencies if MSVCR == "90": - root.start_component("msvcr90") + root.start_component("msvcr90", feature=private_crt) for file, kw in extract_msvcr90(): root.add_file(file, **kw) if file.endswith("manifest"): |