[Python-3000-checkins] r66960 - in python/branches/py3k: Misc/NEWS Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Oct 17 15:47:20 2008
New Revision: 66960

Log:
Merged revisions 66958 via svnmerge from
svn+ssh://pythondev at 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.
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Misc/NEWS
python/branches/py3k/Tools/msi/msi.py

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Fri Oct 17 15:47:20 2008
@@ -67,6 +67,8 @@
Build
-----

+- Issue #4091: Install pythonxy.dll in system32 again.
+
- Issue #4018: Disable "for me" installations on Vista.

Tools/Demos

Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py (original)
+++ python/branches/py3k/Tools/msi/msi.py Fri Oct 17 15:47:20 2008
@@ -916,9 +916,7 @@
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)