diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-10-02 11:46:09 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-10-02 11:46:09 (GMT) |
| commit | f7cef62419ab4ecab0c6e9b92700db8843f70bfc (patch) | |
| tree | ce414afe71d655797ee65528fa3d94a2f1aa5712 /Tools/msi | |
| parent | fe21884a6014bec830fe8551a8bd8f21e3eb5936 (diff) | |
| download | cpython-f7cef62419ab4ecab0c6e9b92700db8843f70bfc.zip cpython-f7cef62419ab4ecab0c6e9b92700db8843f70bfc.tar.gz cpython-f7cef62419ab4ecab0c6e9b92700db8843f70bfc.tar.bz2 | |
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.
........
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/merge.py | 4 |
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)
|