traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow passing the MSI file name to merge.py.

This commit is contained in:
Martin v. Löwis 2008-09-08 12:02:45 +00:00
parent ace0bcf669
commit 67543a9dc9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -125,6 +125,8 @@ Tests
Build Build
----- -----
- Allow passing the MSI file name to merge.py.
- Issue #3758: Rename the 'check' target to 'patchcheck' so as to not clash - Issue #3758: Rename the 'check' target to 'patchcheck' so as to not clash
with GNU build target guidelines. with GNU build target guidelines.

9
Tools/msi/merge.py
View File

@ -1,16 +1,19 @@
import msilib,os,win32com,tempfile import msilib,os,win32com,tempfile,sys
PCBUILD="PCBuild" PCBUILD="PCBuild"
from config import * from config import *
Win64 = "amd64" in PCBUILD Win64 = "amd64" in PCBUILD
mod_dir = os.path.join(os.environ["ProgramFiles"], "Common Files", "Merge Modules") 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: if Win64:
modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"] 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: else:
modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"] 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): for i, n in enumerate(modules):
modules[i] = os.path.join(mod_dir, n) modules[i] = os.path.join(mod_dir, n)