From: Martin v. Löwis Date: Thu, 2 Oct 2008 11:46:09 +0000 (+0000) Subject: Merged revisions 66722 via svnmerge from X-Git-Tag: v3.0rc2~124 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7cef62419ab4ecab0c6e9b92700db8843f70bfc;p=python Merged revisions 66722 via svnmerge from 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. ........ --- diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py index 3202f98b2a..959978be44 100644 --- a/Tools/msi/merge.py +++ b/Tools/msi/merge.py @@ -9,10 +9,10 @@ msi = None 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)