From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 31 Aug 2007 10:00:06 +0000 (+0000)
Subject: Mark registry components as 64-bit on Win64.
X-Git-Tag: v2.5.2c1~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=738032ffe83eac3e1d1fdaa73ecf85166c1015bc;p=python

Mark registry components as 64-bit on Win64.
---

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 181c2eaa73..893bca92e3 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -167,8 +167,10 @@ else:
 
 if msilib.Win64:
     SystemFolderName = "[System64Folder]"
+    registry_component = 4|256
 else:
     SystemFolderName = "[SystemFolder]"
+    registry_component = 4
 
 msilib.reset()
 
@@ -1061,15 +1063,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