From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 8 Sep 2008 12:02:45 +0000 (+0000)
Subject: Allow passing the MSI file name to merge.py.
X-Git-Tag: v2.6rc1~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67543a9dc90f65b679dce6bb32b4147c211e9769;p=thirdparty%2FPython%2Fcpython.git

Allow passing the MSI file name to merge.py.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 6c22cd825e22..72361f9b7889 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -125,6 +125,8 @@ Tests
 Build
 -----
 
+- Allow passing the MSI file name to merge.py.
+
 - Issue #3758: Rename the 'check' target to 'patchcheck' so as to not clash 
   with GNU build target guidelines.
 
diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
index ff34b9354b08..412356765da6 100644
--- a/Tools/msi/merge.py
+++ b/Tools/msi/merge.py
@@ -1,16 +1,19 @@
-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)