[Python-3000-checkins] r64599 - in python/branches/py3k: PCbuild/sqlite3.vcproj Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Mon Jun 30 09:03:57 2008
New Revision: 64599

Log:
Merged revisions 64597-64598 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64597 | martin.v.loewis | 2008-06-30 08:57:39 +0200 (Mo, 30 Jun 2008) | 1 line
  
  Issue #3215: Build sqlite3 as sqlite3.dll, not sqlite3.pyd
........
  r64598 | martin.v.loewis | 2008-06-30 09:01:09 +0200 (Mo, 30 Jun 2008) | 1 line
  
  Add _multiprocessing module.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/PCbuild/sqlite3.vcproj
   python/branches/py3k/Tools/msi/msi.py

Modified: python/branches/py3k/PCbuild/sqlite3.vcproj
==============================================================================
--- python/branches/py3k/PCbuild/sqlite3.vcproj	(original)
+++ python/branches/py3k/PCbuild/sqlite3.vcproj	Mon Jun 30 09:03:57 2008
@@ -305,6 +305,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -428,6 +429,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py	(original)
+++ python/branches/py3k/Tools/msi/msi.py	Mon Jun 30 09:03:57 2008
@@ -92,7 +92,8 @@
     '_ctypes.pyd',
     '_ctypes_test.pyd',
     '_sqlite3.pyd',
-    '_hashlib.pyd'
+    '_hashlib.pyd',
+    '_multiprocessing.pyd'
 ]
 
 # Well-known component UUIDs