From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 17 Dec 2010 21:04:09 +0000 (+0000)
Subject: Upgrade to sqlite3 3.7.4.
X-Git-Tag: v3.2b2~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e74cacdffc51b47316269a280064f987eb74bb3;p=thirdparty%2FPython%2Fcpython.git

Upgrade to sqlite3 3.7.4.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 5323087729dd..784eb67983b7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -79,7 +79,7 @@ Tools/Demos
 Build
 -----
 
-- The Windows build now uses Tcl/Tk 8.5.9.
+- The Windows build now uses Tcl/Tk 8.5.9 and sqlite3 3.7.4.
 
 
 What's New in Python 3.2 Beta 1?
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 52cef12d76bb..2ec9fdd98394 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -50,7 +50,7 @@
 	/>
 	<UserMacro
 		Name="sqlite3Dir"
-		Value="$(externalsDir)\sqlite-3.6.21"
+		Value="$(externalsDir)\sqlite-3.7.4"
 	/>
 	<UserMacro
 		Name="bz2Dir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 48ff8eb4bd5c..dbe031f4749c 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -104,7 +104,7 @@ winsound
 
 Python-controlled subprojects that wrap external projects:
 _sqlite3
-    Wraps SQLite 3.6.21, which is currently built by sqlite3.vcproj (see below).
+    Wraps SQLite 3.7.4, which is currently built by sqlite3.vcproj (see below).
 _tkinter
     Wraps the Tk windowing system.  Unlike _sqlite3, there's no
     corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 8f3c6d6f578a..8c8ac3d25ce5 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-1.0.0a rd /s/q openssl-1.0.0a
-@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21    
+@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4    
 
 @rem bzip
 if not exist bzip2-1.0.5 (
@@ -37,7 +37,7 @@ if not exist tcl-8.5.9.0 (
 if not exist tk-8.5.9.0 svn export http://svn.python.org/projects/external/tk-8.5.9.0
 
 @rem sqlite3
-if not exist sqlite-3.6.21 (
-  rd /s/q sqlite-source-3.3.4
-  svn export http://svn.python.org/projects/external/sqlite-3.6.21
+if not exist sqlite-3.7.4 (
+  rd /s/q sqlite-source-3.6.21
+  svn export http://svn.python.org/projects/external/sqlite-3.7.4
 )