[Python-checkins] r66959 - in python/branches/release26-maint: Misc/NEWS Tools/msi/msi.py
martin.v.loewis
python-checkins at python.org
Fri Oct 17 15:43:58 CEST 2008
Author: martin.v.loewis
Date: Fri Oct 17 15:43:58 2008
New Revision: 66959
Log:
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.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Misc/NEWS
python/branches/release26-maint/Tools/msi/msi.py
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Fri Oct 17 15:43:58 2008
@@ -33,6 +33,8 @@
Build
-----
+- Issue #4091: Install pythonxy.dll in system32 again.
+
- Issue #4018: Disable "for me" installations on Vista.
- Issue #3758: Add ``patchcheck`` build target to .PHONY.
Modified: python/branches/release26-maint/Tools/msi/msi.py
==============================================================================
--- python/branches/release26-maint/Tools/msi/msi.py (original)
+++ python/branches/release26-maint/Tools/msi/msi.py Fri Oct 17 15:43:58 2008
@@ -914,9 +914,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)
More information about the Python-checkins
mailing list