mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 15:43:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 59313-59320 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59317 | martin.v.loewis | 2007-12-04 09:37:59 +0100 (Tue, 04 Dec 2007) | 2 lines

  Fix chflags issue on Tru64, from #1490190.
........
  r59318 | martin.v.loewis | 2007-12-04 09:39:16 +0100 (Tue, 04 Dec 2007) | 2 lines

  Move nt.access change into the right section.
........
  r59320 | christian.heimes | 2007-12-04 15:57:30 +0100 (Tue, 04 Dec 2007) | 2 lines

  Added self generated UUID for msvcr90.dll to msi.py
  Readded a missing line.
........
This commit is contained in:
Christian Heimes 2007-12-04 15:00:33 +00:00
parent de10c85314
commit d0764e2bd1
3 changed files with 179 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Tools/msi/msi.py
View file

@ -106,8 +106,9 @@ extensions = [
# from 1 to 2 (due to what I consider a bug in MSI)
# Using the same UUID is fine since these files are versioned,
# so Installer will always keep the newest version.
# NOTE: All uuids are self generated.
msvcr71_uuid = "{8666C8DD-D0B4-4B42-928E-A69E32FA5D4D}"
msvcr90_uuid = "" # XXX
msvcr90_uuid = "{9C28CD84-397C-4045-855C-28B02291A272}"
pythondll_uuid = {
"24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}",
"25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}",
@ -824,7 +825,8 @@ def extract_msvcr71():
dir = _winreg.QueryValueEx(k, "MSMDir")[0]
_winreg.CloseKey(k)
files = glob.glob1(dir, "*CRT71*")
assert len(files) > 0, (dir, files)
assert len(files) == 1, (dir, files)
file = os.path.join(dir, files[0])
# Extract msvcr71.dll
m = msilib.MakeMerge2()
m.OpenModule(file, 0)