Merged revisions 64243-64244 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64243 | martin.v.loewis | 2008-06-13 20:12:51 +0200 (Fr, 13 Jun 2008) | 1 line

  Switch to SQLite 3.5.9.
........
  r64244 | martin.v.loewis | 2008-06-13 20:19:49 +0200 (Fr, 13 Jun 2008) | 1 line

  Update AMD64 build for amalgamated sqlite.
........

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index eb6ab328f2218a7b0fa1e883d54949131ece13b0..f16cf00a5bbf7661349ea4b1ec4728cf9b55f1b6 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -74,7 +74,7 @@
        />
        <UserMacro
                Name="sqlite3Dir"
-               Value="$(externalsDir)\sqlite-source-3.3.4"
+               Value="$(externalsDir)\sqlite-3.5.9"
        />
        <UserMacro
                Name="bz2Dir"

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index f56828d91198d159f5aea38740b04946eff65889..d3c10e55b93902b46d24876a5f0a23161da7ce7d 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -107,7 +107,7 @@ _bsddb
     Wraps Berkeley DB 4.4.20, which is currently built by _bsddb44.vcproj.
     project (see below).
 _sqlite3
-    Wraps SQLite 3.3.4, which is currently built by sqlite3.vcproj (see below).
+    Wraps SQLite 3.5.9, which is currently built by sqlite3.vcproj (see below).
 _tkinter
     Wraps the Tk windowing system.  Unlike _bsddb and _sqlite3, there's no
     corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's

diff --git a/PCbuild/sqlite3.vcproj b/PCbuild/sqlite3.vcproj
index a88b30fcbb7e385f7003fb7f6f7e010e5de08c19..77f91a535dfae5988cf96da21b1030e8053ae108 100644 (file)
--- a/PCbuild/sqlite3.vcproj
+++ b/PCbuild/sqlite3.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9.00"\r
+       Version="9,00"\r
        Name="sqlite3"\r
        ProjectGUID="{A1A295E5-463C-437F-81CA-1F32367685DA}"\r
        RootNamespace="sqlite3"\r
@@ -43,6 +43,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -56,7 +57,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(ProjectName)_d.dll"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -105,6 +105,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -118,7 +119,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(ProjectName)_d.dll"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -167,6 +167,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -180,7 +181,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(ProjectName).dll"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -230,6 +230,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -243,7 +244,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(ProjectName).dll"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -292,6 +292,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -304,7 +305,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -354,6 +354,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -366,7 +367,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -415,6 +415,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -427,7 +428,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -477,6 +477,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -489,7 +490,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -520,52 +520,12 @@
                <Filter\r
                        Name="Header Files"\r
                        >\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\btree.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\hash.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\keywordhash.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\opcodes.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\os.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\os_common.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\pager.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\parse.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="$(sqlite3Dir)\sqlite3.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\sqliteInt.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\vdbe.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\vdbeInt.h"\r
+                               RelativePath="$(sqlite3Dir)\sqlite3ext.h"\r
                                >\r
                        </File>\r
                </Filter>\r
@@ -573,167 +533,7 @@
                        Name="Source Files"\r
                        >\r
                        <File\r
-                               RelativePath="$(sqlite3Dir)\alter.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\analyze.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\attach.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\auth.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\btree.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\build.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\callback.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\complete.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\date.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\delete.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\expr.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\func.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\hash.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\insert.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\legacy.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\main.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\opcodes.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\os.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\os_unix.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\os_win.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\pager.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\parse.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\pragma.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\prepare.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\printf.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\random.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\select.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\shell.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\table.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\tokenize.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\trigger.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\update.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\utf.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\util.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\vacuum.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\vdbe.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\vdbeapi.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\vdbeaux.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\vdbefifo.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\vdbemem.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(sqlite3Dir)\where.c"\r
+                               RelativePath="$(sqlite3Dir)\sqlite3.c"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 236245d75a92f5d22d787d0e564100bb762786ab..80316be2295e556ea91e84a87845c632654a0250 100644 (file)
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -15,7 +15,7 @@ cd ..
 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1\r
 @rem if exist db-4.4.20 rd /s/q db-4.4.20\r
 @rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g\r
-@rem if exist sqlite-source-3.3.4 rd /s/q sqlite-source-3.3.4    \r
+@rem if exist sqlite-source-3.5.9 rd /s/q sqlite-source-3.5.9    \r
 \r
 @rem bzip\r
 if not exist bzip2-1.0.5 (\r
@@ -37,4 +37,7 @@ if not exist tcl-8.5.2.1 (
 if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0\r
 \r
 @rem sqlite3\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 sqlite-source-3.5.9 (\r
+  rd /s/q sqlite-source-3.3.4\r
+  svn export http://svn.python.org/projects/external/sqlite-source-3.5.9\r
+)\r