Update Windows build to sqlite 3.6.21.

diff --git a/Misc/NEWS b/Misc/NEWS
index eb836749fec6a36f76f12d1cdd0d41e5bf12f563..898a3557fea243d883124cc2c2df9736923f5fe5 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -121,7 +121,7 @@ Build
 - Issue #7589: Only build the nis module when the correct header files are
   found.
 
-- Switch to OpenSSL 0.9.8l on Windows.
+- Switch to OpenSSL 0.9.8l and sqlite 3.6.21 on Windows.
 
 - Issue #7541: when using ``python-config`` with a framework install the compiler might
   use the wrong library.

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 1c69a7df542ca2ba730439113467be2b4d20712d..3039885aa63813e6043830fbf7516a467c076f18 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -74,7 +74,7 @@
        />
        <UserMacro
                Name="sqlite3Dir"
-               Value="$(externalsDir)\sqlite-3.5.9"
+               Value="$(externalsDir)\sqlite-3.6.21"
        />
        <UserMacro
                Name="bz2Dir"

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 44b7b8fd020bbd716452e668be49a7f00408341f..0386b456a05d3e67dac76c6509731d1f60dd46ee 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -107,7 +107,7 @@ _bsddb
     Wraps Berkeley DB 4.7.25, which is currently built by _bsddb.vcproj.
     project (see below).
 _sqlite3
-    Wraps SQLite 3.5.9, which is currently built by sqlite3.vcproj (see below).
+    Wraps SQLite 3.6.21, 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/vs9to8.py b/PCbuild/vs9to8.py
index 2dfbd5dc39594482c8c1a95a04d3753bdaea07d3..a4e68018308fb98c313605860a2eba0f2539c4e4 100644 (file)
--- a/PCbuild/vs9to8.py
+++ b/PCbuild/vs9to8.py
@@ -24,7 +24,7 @@ def vs9to8(src, dest):
 
             # Bah. VS8.0 does not expand macros in file names.
             # Replace them here.
-            lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-3.5.9')
+            lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-3.6.21')
             lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.7.25.0\\build_windows\\..')
             lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.7.25.0\\build_windows')
 

diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 839a4cddec5ca93a209ec69875cc1b27e657cadd..7395db5b502bf1faf831f951f46a2bf8b91ea433 100644 (file)
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -16,7 +16,7 @@ cd ..
 @rem if exist db-4.4.20 rd /s/q db-4.4.20\r
 @rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0\r
 @rem if exist openssl-0.9.8l rd /s/q openssl-0.9.8l\r
-@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9    \r
+@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21    \r
 \r
 @rem bzip\r
 if not exist bzip2-1.0.5 (\r
@@ -39,7 +39,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-3.5.9 (\r
+if not exist sqlite-3.6.21 (\r
   rd /s/q sqlite-source-3.3.4\r
-  svn export http://svn.python.org/projects/external/sqlite-3.5.9\r
+  svn export http://svn.python.org/projects/external/sqlite-3.6.21\r
 )\r