Merged revisions 64597-64598 via svnmerge from

loewis · loewis · commit 9aa04c4e83fe · 2008-06-30T07:03:57.000Z
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
@@ -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
@@ -92,7 +92,8 @@
     '_ctypes.pyd',
     '_ctypes_test.pyd',
     '_sqlite3.pyd',
-    '_hashlib.pyd'
+    '_hashlib.pyd',
+    '_multiprocessing.pyd'
 ]
 
 # Well-known component UUIDs

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@`
`92`	`92`	`'_ctypes.pyd',`
`93`	`93`	`'_ctypes_test.pyd',`
`94`	`94`	`'_sqlite3.pyd',`
`95`		`- '_hashlib.pyd'`
	`95`	`+ '_hashlib.pyd',`
	`96`	`+ '_multiprocessing.pyd'`
`96`	`97`	`]`
`97`	`98`
`98`	`99`	`# Well-known component UUIDs`