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.
........

diff --git a/PCbuild/sqlite3.vcproj b/PCbuild/sqlite3.vcproj
index e4d74e6f8353effb285d05993d636f9e21dd59b4..2a64fffe304324e98adad7cf9d838e1a24d319b5 100644 (file)
--- a/PCbuild/sqlite3.vcproj
+++ b/PCbuild/sqlite3.vcproj
@@ -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"

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index a4f87edef52ef809d5cd6b79879b0add78c3d507..7744d8e7f40da01f6049f8a912e0c6cc37af12c9 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -92,7 +92,8 @@ extensions = [
     '_ctypes.pyd',
     '_ctypes_test.pyd',
     '_sqlite3.pyd',
-    '_hashlib.pyd'
+    '_hashlib.pyd',
+    '_multiprocessing.pyd'
 ]
 
 # Well-known component UUIDs