[Python-checkins] r57833 - python/trunk/Tools/msi/msi.py

Fri Aug 31 12:01:07 CEST 2007

Author: martin.v.loewis
Date: Fri Aug 31 12:01:07 2007
New Revision: 57833
Modified:
 python/trunk/Tools/msi/msi.py
Log:
Mark registry components as 64-bit on Win64.
Modified: python/trunk/Tools/msi/msi.py
==============================================================================

--- python/trunk/Tools/msi/msi.py	(original)
+++ python/trunk/Tools/msi/msi.py	Fri Aug 31 12:01:07 2007
@@ -168,8 +168,10 @@
 
 if msilib.Win64:
 SystemFolderName = "[System64Folder]"
+ registry_component = 4|256
 else:
 SystemFolderName = "[SystemFolder]"
+ registry_component = 4
 
 msilib.reset()
 
@@ -1062,15 +1064,15 @@
 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
