diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-09-08 12:02:45 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-09-08 12:02:45 (GMT) |
| commit | 67543a9dc90f65b679dce6bb32b4147c211e9769 (patch) | |
| tree | 3115bd0d5829cbd73c58226f917eecef0128da8e | |
| parent | ace0bcf6690ccf042b20203325048f0b9fef85de (diff) | |
| download | cpython-67543a9dc90f65b679dce6bb32b4147c211e9769.zip cpython-67543a9dc90f65b679dce6bb32b4147c211e9769.tar.gz cpython-67543a9dc90f65b679dce6bb32b4147c211e9769.tar.bz2 | |
Allow passing the MSI file name to merge.py.
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Tools/msi/merge.py | 9 |
2 files changed, 8 insertions, 3 deletions
@@ -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 ff34b93..4123567 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)
|