From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 30 Jun 2008 07:03:57 +0000 (+0000)
Subject: Merged revisions 64597-64598 via svnmerge from
X-Git-Tag: v3.0b2~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9aa04c4e83fed2cb9615b97049caf65c8e38f724;p=python

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 e4d74e6f83..2a64fffe30 100644
--- 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 a4f87edef5..7744d8e7f4 100644
--- 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