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.
........

4 files changed, 18 insertions, 215 deletions

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index eb6ab32..f16cf00 100644
--- 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 f56828d..d3c10e5 100644
--- 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 a88b30f..77f91a5 100644
--- a/PCbuild/sqlite3.vcproj
+++ b/PCbuild/sqlite3.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="sqlite3"

 	ProjectGUID="{A1A295E5-463C-437F-81CA-1F32367685DA}"

 	RootNamespace="sqlite3"

@@ -43,6 +43,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -56,7 +57,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"

-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -105,6 +105,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -118,7 +119,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"

-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -167,6 +167,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -180,7 +181,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).dll"

-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -230,6 +230,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -243,7 +244,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="$(OutDir)\$(ProjectName).dll"

-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -292,6 +292,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -304,7 +305,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -354,6 +354,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -366,7 +367,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -415,6 +415,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -427,7 +428,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -477,6 +477,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="$(sqlite3Dir)"

+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -489,7 +490,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -521,51 +521,11 @@
 			Name="Header Files"

 			>

 			<File

-				RelativePath="$(sqlite3Dir)\btree.h"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\hash.h"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\keywordhash.h"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\opcodes.h"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\os.h"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\os_common.h"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\pager.h"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\parse.h"

-				>

-			</File>

-			<File

 				RelativePath="$(sqlite3Dir)\sqlite3.h"

 				>

 			</File>

 			<File

-				RelativePath="$(sqlite3Dir)\sqliteInt.h"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\vdbe.h"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\vdbeInt.h"

+				RelativePath="$(sqlite3Dir)\sqlite3ext.h"

 				>

 			</File>

 		</Filter>

@@ -573,167 +533,7 @@
 			Name="Source Files"

 			>

 			<File

-				RelativePath="$(sqlite3Dir)\alter.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\analyze.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\attach.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\auth.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\btree.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\build.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\callback.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\complete.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\date.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\delete.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\expr.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\func.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\hash.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\insert.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\legacy.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\main.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\opcodes.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\os.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\os_unix.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\os_win.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\pager.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\parse.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\pragma.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\prepare.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\printf.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\random.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\select.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\shell.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\table.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\tokenize.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\trigger.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\update.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\utf.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\util.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\vacuum.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\vdbe.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\vdbeapi.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\vdbeaux.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\vdbefifo.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\vdbemem.c"

-				>

-			</File>

-			<File

-				RelativePath="$(sqlite3Dir)\where.c"

+				RelativePath="$(sqlite3Dir)\sqlite3.c"

 				>

 			</File>

 		</Filter>

diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 236245d..80316be 100644
--- 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

 @rem if exist db-4.4.20 rd /s/q db-4.4.20

 @rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g

-@rem if exist sqlite-source-3.3.4 rd /s/q sqlite-source-3.3.4    

+@rem if exist sqlite-source-3.5.9 rd /s/q sqlite-source-3.5.9    

 

 @rem bzip

 if not exist bzip2-1.0.5 (

@@ -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

 

 @rem sqlite3

-if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4

+if not exist sqlite-source-3.5.9 (

+  rd /s/q sqlite-source-3.3.4

+  svn export http://svn.python.org/projects/external/sqlite-source-3.5.9

+)