[Python-3000-checkins] r66723 - in python/branches/py3k: Tools/msi/merge.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Oct 2 13:46:09 2008
New Revision: 66723

Log:
Merged revisions 66722 via svnmerge from
svn+ssh://pythondev at 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.
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Tools/msi/merge.py

Modified: python/branches/py3k/Tools/msi/merge.py
==============================================================================
--- python/branches/py3k/Tools/msi/merge.py (original)
+++ python/branches/py3k/Tools/msi/merge.py Thu Oct 2 13:46:09 2008
@@ -9,10 +9,10 @@
if len(sys.argv)==2:
msi = sys.argv[1]
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
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
for i, n in enumerate(modules):
modules[i] = os.path.join(mod_dir, n)