summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2007-08-31 09:59:29 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2007-08-31 09:59:29 (GMT)
commit283e35f606a52fe3ad3cb8006a41155476118b7c (patch)
treedc8ff5097f4a99e74eb8b8ac631880e79678f39b
parent680d7befc0ba4c179a578b2d3e24b43912e2349e (diff)
downloadcpython-283e35f606a52fe3ad3cb8006a41155476118b7c.zip
cpython-283e35f606a52fe3ad3cb8006a41155476118b7c.tar.gz
cpython-283e35f606a52fe3ad3cb8006a41155476118b7c.tar.bz2
Mark registry components as 64-bit on Win64.
-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 fdc77ce..20ade0e 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -169,8 +169,10 @@ else:
if msilib.Win64:
SystemFolderName = "[System64Folder]"
+ registry_component = 4|256
else:
SystemFolderName = "[SystemFolder]"
+ registry_component = 4
msilib.reset()
@@ -1063,15 +1065,15 @@ def add_registry(db):
tcldata = []
if have_tcl:
tcldata = [
- ("REGISTRY.tcl", msilib.gen_uuid(), "TARGETDIR", 4, None,
+ ("REGISTRY.tcl", msilib.gen_uuid(), "TARGETDIR", registry_component, None,
"py.IDLE")]
add_data(db, "Component",
# msidbComponentAttributesRegistryKeyPath = 4
- [("REGISTRY", msilib.gen_uuid(), "TARGETDIR", 4, None,
+ [("REGISTRY", msilib.gen_uuid(), "TARGETDIR", registry_component, None,
"InstallPath"),
- ("REGISTRY.doc", msilib.gen_uuid(), "TARGETDIR", 4, None,
+ ("REGISTRY.doc", msilib.gen_uuid(), "TARGETDIR", registry_component, None,
"Documentation"),
- ("REGISTRY.def", msilib.gen_uuid(), "TARGETDIR", 4,
+ ("REGISTRY.def", msilib.gen_uuid(), "TARGETDIR", registry_component,
None, None)] + tcldata)
# See "FeatureComponents Table".
# The association between TclTk and pythonw.exe is necessary to make ICE59