mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 66722 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66722 | martin.v.loewis | 2008-10-02 13:44:17 +0200 (Do, 02 Okt 2008) | 1 line

  Use CRT 9 policy files.
........
This commit is contained in:
Martin v. Löwis 2008-10-02 11:46:09 +00:00
parent fe21884a60
commit f7cef62419
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Tools/msi/merge.py
View file

@ -9,10 +9,10 @@ msi = None
if len(sys.argv)==2: if len(sys.argv)==2:
msi = sys.argv[1] msi = sys.argv[1]
if Win64: if Win64:
modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"] modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"]
if not msi: 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_9_0_Microsoft_VC90_CRT_x86.msm"]
if not msi: 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)