diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-12-08 11:18:23 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-12-08 11:18:23 +0000 |
| commit | c9d4efdf486d498ba138195796645f201100b699 (patch) | |
| tree | f18439f5089bb4aaa3c0ee10838a616d07ff452e | |
| parent | 0f5d5caa4f318dfc5685e0ec7de6d5f0176ee86e (diff) | |
| download | cpython-git-c9d4efdf486d498ba138195796645f201100b699.tar.gz | |
Merged revisions 67658-67659 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67658 | martin.v.loewis | 2008-12-08 12:14:57 +0100 (Mo, 08 Dez 2008) | 1 line
Add UUIDs for 2.6.1 and 2.6.2.
........
r67659 | martin.v.loewis | 2008-12-08 12:15:35 +0100 (Mo, 08 Dez 2008) | 1 line
Consider micro version for name of CHM file.
........
| -rw-r--r-- | Tools/msi/msi.py | 2 | ||||
| -rw-r--r-- | Tools/msi/uuids.py | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index a942792987..cbeea0d81e 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -115,6 +115,8 @@ pythondll_uuid = { # Compute the name that Sphinx gives to the docfile docfile = "" +if micro: + docfile = str(micro) if level < 0xf: docfile = '%x%s' % (level, serial) docfile = 'python%s%s%s.chm' % (major, minor, docfile) diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py index 163bb4848c..552c609646 100644 --- a/Tools/msi/uuids.py +++ b/Tools/msi/uuids.py @@ -47,4 +47,7 @@ product_codes = { '2.6.121': '{bbd34464-ddeb-4028-99e5-f16c4a8fbdb3}', # 2.6c1 '2.6.122': '{8f64787e-a023-4c60-bfee-25d3a3f592c6}', # 2.6c2 '2.6.150': '{110eb5c4-e995-4cfb-ab80-a5f315bea9e8}', # 2.6.0 + '2.6.1150':'{9cc89170-000b-457d-91f1-53691f85b223}', # 2.6.1 + '2.6.2121':'{adac412b-b209-4c15-b6ab-dca1b6e47144}', # 2.6.2c1 + '2.6.2150':'{24aab420-4e30-4496-9739-3e216f3de6ae}', # 2.6.2 } |