diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-06-30 07:03:57 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-06-30 07:03:57 (GMT) |
| commit | 9aa04c4e83fed2cb9615b97049caf65c8e38f724 (patch) | |
| tree | 03b23fa12e8d1a347e4f713741b4940d54afd7af | |
| parent | 029656fb3bc23a2ce03a81fe30bc1b1e5ce5e4cd (diff) | |
| download | cpython-9aa04c4e83fed2cb9615b97049caf65c8e38f724.zip cpython-9aa04c4e83fed2cb9615b97049caf65c8e38f724.tar.gz cpython-9aa04c4e83fed2cb9615b97049caf65c8e38f724.tar.bz2 | |
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.
........
| -rw-r--r-- | PCbuild/sqlite3.vcproj | 2 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/PCbuild/sqlite3.vcproj b/PCbuild/sqlite3.vcproj index e4d74e6..2a64fff 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 a4f87ed..7744d8e 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 |