diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-10-17 13:47:20 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-10-17 13:47:20 +0000 |
| commit | c820eaf34793284c03e45b0346d2deca18cb84b5 (patch) | |
| tree | 3ab2cc21b4b2ea70021c60fe3560efc6317bc32b | |
| parent | 34bbf006bd6e9783dd02065c0cf4746060692a8c (diff) | |
| download | cpython-git-c820eaf34793284c03e45b0346d2deca18cb84b5.tar.gz | |
Merged revisions 66958 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66958 | martin.v.loewis | 2008-10-17 15:43:01 +0200 (Fr, 17 Okt 2008) | 1 line
Issue #4091: Install pythonxy.dll in system32 again.
........
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -67,6 +67,8 @@ Extension Modules Build ----- +- Issue #4091: Install pythonxy.dll in system32 again. + - Issue #4018: Disable "for me" installations on Vista. Tools/Demos diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 022067c954..d30268881a 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -916,9 +916,7 @@ def add_files(db): root.add_file("%s/pythonw.exe" % PCBUILD) # msidbComponentAttributesSharedDllRefCount = 8, see "Component Table" - #dlldir = PyDirectory(db, cab, root, srcdir, "DLLDIR", ".") - #install python30.dll into root dir for now - dlldir = root + dlldir = PyDirectory(db, cab, root, srcdir, "DLLDIR", ".") pydll = "python%s%s.dll" % (major, minor) pydllsrc = os.path.join(srcdir, PCBUILD, pydll) |