summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-10-02 11:55:09 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-10-02 11:55:09 (GMT)
commite15551bf3899a85659b07cd6d75ffe47b33f392b (patch)
treecc2e22ce8bcd0b6e955a6dcf7b0c173827391744 /Tools
parenta5a38c508ee42a66ac57443ec3377cee405e6039 (diff)
downloadcpython-e15551bf3899a85659b07cd6d75ffe47b33f392b.zip
cpython-e15551bf3899a85659b07cd6d75ffe47b33f392b.tar.gz
cpython-e15551bf3899a85659b07cd6d75ffe47b33f392b.tar.bz2
Backport of r66722: Use CRT 9 policy files.
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/merge.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
index 3202f98..959978b 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)