]> granicus.if.org Git - python/commitdiff
Mark registry components as 64-bit on Win64.
authorMartin v. Löwis <martin@v.loewis.de>
Fri, 31 Aug 2007 09:59:29 +0000 (09:59 +0000)
committerMartin v. Löwis <martin@v.loewis.de>
Fri, 31 Aug 2007 09:59:29 +0000 (09:59 +0000)
Tools/msi/msi.py

index fdc77ce32e4843087bfee30c7f15ed63ec1062d2..20ade0e88ae71e8e7f49e3c7a12d549a5f4e421a 100644 (file)
@@ -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