Project: Python

Revision: 66304

Author: martin.v.loewis

Date: 08 Sep 2008 08:02:45

• /python/trunk/Tools/msi/merge.py

  ......	@@ -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

• /python/trunk/Misc/NEWS

  ......	@@ -125,6 +125,8 @@
  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