Add sqlite3 to the Windows build process.

diff --git a/PCbuild/_sqlite3.vcproj b/PCbuild/_sqlite3.vcproj
new file mode 100644 (file)
index 0000000..03605cd
--- /dev/null
+++ b/PCbuild/_sqlite3.vcproj
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="7.10"
+       Name="_sqlite3"
+       ProjectGUID="{2FF0A312-22F9-4C34-B070-842916DE27A9}"
+       SccProjectName="_sqlite3"
+       SccLocalPath="..">
+       <Platforms>
+               <Platform
+                       Name="Win32"/>
+       </Platforms>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory=".\."
+                       IntermediateDirectory=".\x86-temp-debug\_sqlite3"
+                       ConfigurationType="2"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;PYSQLITE_VERSION=&quot;2.1.3&quot;"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="2"
+                               WarningLevel="3"
+                               SuppressStartupBanner="TRUE"
+                               DebugInformationFormat="3"
+                               CompileAs="0"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="./_sqlite3_d.pyd"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="TRUE"
+                               IgnoreDefaultLibraryNames=""
+                               GenerateDebugInformation="TRUE"
+                               ProgramDatabaseFile=".\./_sqlite3_d.pdb"
+                               SubSystem="2"
+                               BaseAddress="0x1e180000"
+                               ImportLibrary=".\./_sqlite3_d.lib"
+                               TargetMachine="1"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory=".\."
+                       IntermediateDirectory=".\x86-temp-release\_sqlite3"
+                       ConfigurationType="2"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="2"
+                               InlineFunctionExpansion="1"
+                               AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;PYSQLITE_VERSION=\&quot;2.1.3\&quot;"
+                               StringPooling="TRUE"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="TRUE"
+                               UsePrecompiledHeader="2"
+                               WarningLevel="3"
+                               SuppressStartupBanner="TRUE"
+                               DebugInformationFormat="3"
+                               CompileAs="0"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
+                               OutputFile="./_sqlite3.pyd"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="TRUE"
+                               IgnoreDefaultLibraryNames=""
+                               GenerateDebugInformation="TRUE"
+                               ProgramDatabaseFile=".\./_sqlite3.pdb"
+                               SubSystem="2"
+                               BaseAddress="0x1e180000"
+                               ImportLibrary=".\./_sqlite3.lib"
+                               TargetMachine="1"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
+               <Configuration
+                       Name="ReleaseItanium|Win32"
+                       OutputDirectory="./."
+                       IntermediateDirectory=".\ia64-temp-release\_sqlite3"
+                       ConfigurationType="2"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               Optimization="2"
+                               InlineFunctionExpansion="1"
+                               AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include;..\PC;..\..\sqlite-source-3.3.4"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;PYSQLITE_VERSION=&quot;2.1.3&quot;"
+                               StringPooling="TRUE"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="2"
+                               BufferSecurityCheck="FALSE"
+                               EnableFunctionLevelLinking="TRUE"
+                               UsePrecompiledHeader="2"
+                               WarningLevel="3"
+                               SuppressStartupBanner="TRUE"
+                               Detect64BitPortabilityProblems="TRUE"
+                               DebugInformationFormat="3"
+                               CompileAs="0"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
+                               OutputFile="./_sqlite3.pyd"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="TRUE"
+                               IgnoreDefaultLibraryNames=""
+                               GenerateDebugInformation="TRUE"
+                               ProgramDatabaseFile=".\./_sqlite3.pdb"
+                               SubSystem="2"
+                               BaseAddress="0x1e180000"
+                               ImportLibrary=".\./_sqlite3.lib"
+                               TargetMachine="0"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
+               <Configuration
+                       Name="ReleaseAMD64|Win32"
+                       OutputDirectory="."
+                       IntermediateDirectory="amd64-temp-release\_sqlite3"
+                       ConfigurationType="2"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=" /USECL:MS_OPTERON"
+                               Optimization="2"
+                               InlineFunctionExpansion="1"
+                               AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include;..\PC;..\..\sqlite-source-3.3.4"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;PYSQLITE_VERSION=&quot;2.1.3&quot;"
+                               StringPooling="TRUE"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="2"
+                               BufferSecurityCheck="FALSE"
+                               EnableFunctionLevelLinking="TRUE"
+                               UsePrecompiledHeader="2"
+                               WarningLevel="3"
+                               SuppressStartupBanner="TRUE"
+                               Detect64BitPortabilityProblems="TRUE"
+                               DebugInformationFormat="3"
+                               CompileAs="0"/>
+                       <Tool
+                               Name="VCCustomBuildTool"/>
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
+                               OutputFile="./_sqlite3.pyd"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="TRUE"
+                               IgnoreDefaultLibraryNames=""
+                               GenerateDebugInformation="TRUE"
+                               ProgramDatabaseFile=".\./_sqlite3.pdb"
+                               SubSystem="2"
+                               BaseAddress="0x1e180000"
+                               ImportLibrary=".\./_sqlite3.lib"
+                               TargetMachine="0"/>
+                       <Tool
+                               Name="VCMIDLTool"/>
+                       <Tool
+                               Name="VCPostBuildEventTool"/>
+                       <Tool
+                               Name="VCPreBuildEventTool"/>
+                       <Tool
+                               Name="VCPreLinkEventTool"/>
+                       <Tool
+                               Name="VCResourceCompilerTool"/>
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"/>
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"/>
+                       <Tool
+                               Name="VCWebDeploymentTool"/>
+                       <Tool
+                               Name="VCManagedWrapperGeneratorTool"/>
+                       <Tool
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <File
+                       RelativePath="..\Modules\_sqlite\adapters.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\_sqlite\cache.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\_sqlite\connection.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\_sqlite\converters.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\_sqlite\cursor.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\_sqlite\microprotocols.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\_sqlite\module.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\_sqlite\prepare_protocol.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\_sqlite\row.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\_sqlite\statement.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\_sqlite\util.c">
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>

diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index 9390cd578e5194ca913048eb704da36d487921b9..20d3ecfd8c1d48540665daf8582cecfce9036aed 100644 (file)
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -99,6 +99,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_tes
                {F22F40F4-D318-40DC-96B3-88DC81CE0894} = {F22F40F4-D318-40DC-96B3-88DC81CE0894}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}"
+       ProjectSection(ProjectDependencies) = postProject
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfiguration) = preSolution
                Debug = Debug
@@ -261,6 +266,14 @@ Global
                {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release.Build.0 = Release|Win32
                {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32
                {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
+               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug.ActiveCfg = Debug|Win32
+               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug.Build.0 = Debug|Win32
+               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release.ActiveCfg = Release|Win32
+               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release.Build.0 = Release|Win32
+               {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32
+               {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32
+               {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
+               {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseItanium.Build.0 = ReleaseItanium|Win32
        EndGlobalSection
        GlobalSection(SolutionItems) = postSolution
                ..\Modules\getbuildinfo.c = ..\Modules\getbuildinfo.c

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 4ca52ee07010ae2fa1e3d96e81c92545222bdb84..06e559899e762e61d411e9676f13dd9a71ee26b1 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -214,6 +214,15 @@ _bsddb
       target ("Release IA64" for Itanium, "Release AMD64" for AMD64), e.g.
     devenv db-4.4.20\build_win32\Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
 
+_sqlite3
+    Python wrapper for SQLite library.
+    
+    Get the source code through
+    
+    svn export http://svn.python.org/projects/external/sqlite-source-3.3.4
+    
+    To use the extension module in a Python build tree, copy sqlite3.dll into
+    the PCbuild folder.
 
 _ssl
     Python wrapper for the secure sockets library.

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 1195072b7908a42ba700fb0fea982b4f277ef54a..918d759da31c5aa99cc1aa64c135a42631a4b6d2 100644 (file)
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -29,3 +29,7 @@ if not exist tcl8.4.12 (
    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12\r
    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install\r
 )\r
+\r
+@rem sqlite\r
+if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4\r
+if not exist build/Python/PCbuild/sqlite3.dll copy sqlite-source-3.3.4/sqlite3.dll build/Python/PCbuild\r

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 74a364b7af8a60e97b4ace01b3c90e23f97172db..0b8fbc31c494ebd31e9a346332beb02aabd767d1 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -24,6 +24,8 @@ srcdir = os.path.abspath("../..")
 full_current_version = None
 # Is Tcl available at all?
 have_tcl = True
+# Where is sqlite3.dll located, relative to srcdir?
+sqlite_dir = "../sqlite-source-3.3.4"
 
 try:
     from config import *
@@ -86,7 +88,8 @@ extensions = [
     '_tkinter.pyd',
     '_msi.pyd',
     '_ctypes.pyd',
-    '_ctypes_test.pyd'
+    '_ctypes_test.pyd',
+    '_sqlite3.pyd'
 ]
 
 # Well-known component UUIDs
@@ -963,6 +966,8 @@ def add_files(db):
             tcldir = os.path.normpath(srcdir+"/../tcltk/bin")
             for f in glob.glob1(tcldir, "*.dll"):
                 lib.add_file(f, src=os.path.join(tcldir, f))
+    # Add sqlite
+    lib.add_file(srcdir+"/"+sqlite_dir+"/sqlite3.dll")
     # check whether there are any unknown extensions
     for f in glob.glob1(srcdir+"/PCBuild", "*.pyd"):
         if f.endswith("_d.pyd"): continue # debug version