Allow passing the MSI file name to merge.py. · java66liu/python@6ffaec8 · GitHub

java66liu / python Public

forked from glix/python

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 6ffaec8

Browse filesBrowse the repository at this point in the historyBrowse files

martin.v.loewis

committed

Allow passing the MSI file name to merge.py.

git-svn-id: http://svn.python.org/projects/python/trunk@66304 6015fed2-1504-0410-9fe1-9d1591cc4771

1 parent 301e7c2 commit 6ffaec8
Copy full SHA for 6ffaec8

2 files changed

+8-3Lines changed: 8 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Misc
  • NEWS
• Tools/msi
  • merge.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Misc/NEWS‎

Copy file name to clipboardExpand all lines: Misc/NEWS

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -125,6 +125,8 @@ Tests
125	125	Build
126	126	-----
127	127
	128	+ - Allow passing the MSI file name to merge.py.
	129	+
128	130	- Issue #3758: Rename the 'check' target to 'patchcheck' so as to not clash
129	131	with GNU build target guidelines.
130	132

Collapse file

‎Tools/msi/merge.py‎

Copy file name to clipboardExpand all lines: Tools/msi/merge.py

+6-3Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -1,16 +1,19 @@
1		- import msilib,os,win32com,tempfile
	1	+ import msilib,os,win32com,tempfile,sys
2	2	PCBUILD="PCBuild"
3	3	from config import *
4	4
5	5	Win64 = "amd64" in PCBUILD
6	6
7	7	mod_dir = os.path.join(os.environ["ProgramFiles"], "Common Files", "Merge Modules")
	8	+ msi = None
	9	+ if len(sys.argv)==2:
	10	+ msi = sys.argv[1]
8	11	if Win64:
9	12	modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
10		- msi = "python-%s.amd64.msi" % full_current_version
	13	+ if not msi: msi = "python-%s.amd64.msi" % full_current_version
11	14	else:
12	15	modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"]
13		- msi = "python-%s.msi" % full_current_version
	16	+ if not msi: msi = "python-%s.msi" % full_current_version
14	17	for i, n in enumerate(modules):
15	18	modules[i] = os.path.join(mod_dir, n)
16	19

0 commit comments

Comments

0 (0)