Merged revisions 66304-66305,66307 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66304 | martin.v.loewis | 2008-09-08 14:02:45 +0200 (Mo, 08 Sep 2008) | 2 lines

  Allow passing the MSI file name to merge.py.
........
  r66305 | martin.v.loewis | 2008-09-08 15:50:10 +0200 (Mo, 08 Sep 2008) | 3 lines

  Issue #2271: Set SecureCustomProperties so that installation will properly
  use the TARGETDIR even for unprivileged users.
........
  r66307 | martin.v.loewis | 2008-09-08 18:15:38 +0200 (Mo, 08 Sep 2008) | 1 line

  Add UUIDs for upcoming releases
........

Tools/msi/merge.py

-import msilib,os,win32com,tempfile
+import msilib,os,win32com,tempfile,sys
 PCBUILD="PCBuild"
 from config import *
 
 Win64 = "amd64" in PCBUILD
 
 mod_dir = os.path.join(os.environ["ProgramFiles"], "Common Files", "Merge Modules")
+msi = None
+if len(sys.argv)==2:
+    msi = sys.argv[1]
 if Win64:
     modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
-    msi = "python-%s.amd64.msi" % full_current_version
+    if not msi: msi = "python-%s.amd64.msi" % full_current_version
 else:
     modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"]
-    msi = "python-%s.msi" % full_current_version
+    if not msi: msi = "python-%s.msi" % full_current_version
 for i, n in enumerate(modules):
     modules[i] = os.path.join(mod_dir, n)
 

Tools/msi/msi.py

@@ -251,6 +251,8 @@ def remove_old_versions(db):
              (upgrade_code_snapshot, start, "%s.%d.0" % (major, int(minor)+1),
               None, migrate_features, None, "REMOVEOLDSNAPSHOT")])
         props = "REMOVEOLDSNAPSHOT;REMOVEOLDVERSION"
+
+    props += ";TARGETDIR;DLLDIR"
     # Installer collects the product codes of the earlier releases in
     # these properties. In order to allow modification of the properties,
     # they must be declared as secure. See "SecureCustomProperties Property"

Tools/msi/uuids.py

@@ -43,6 +43,10 @@ product_codes = {
     '2.6.104': '{dc6ed634-474a-4a50-a547-8de4b7491e53}', # 2.6a4
     '2.6.111': '{3f82079a-5bee-4c4a-8a41-8292389e24ae}', # 2.6b1
     '2.6.112': '{8a0e5970-f3e6-4737-9a2b-bc5ff0f15fb5}', # 2.6b2
+    '2.6.113': '{df4f5c21-6fcc-4540-95de-85feba634e76}', # 2.6b3
+    '2.6.121': '{bbd34464-ddeb-4028-99e5-f16c4a8fbdb3}', # 2.6c1
+    '2.6.122': '{8f64787e-a023-4c60-bfee-25d3a3f592c6}', # 2.6c2
+    '2.6.150': '{110eb5c4-e995-4cfb-ab80-a5f315bea9e8}', # 2.6.0
     '3.0.101': '{8554263a-3242-4857-9359-aa87bc2c58c2}', # 3.0a1
     '3.0.102': '{692d6e2c-f0ac-40b8-a133-7191aeeb67f9}', # 3.0a2
     '3.0.103': '{49cb2995-751a-4753-be7a-d0b1bb585e06}', # 3.0a3