Update Windows build to sqlite 3.6.21.
diff --git a/Misc/NEWS b/Misc/NEWS
index eb83674..898a355 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -121,7 +121,7 @@
- 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 1c69a7d..3039885 100644
--- 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 44b7b8f..0386b45 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -107,7 +107,7 @@
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 2dfbd5d..a4e6801 100644
--- a/PCbuild/vs9to8.py
+++ b/PCbuild/vs9to8.py
@@ -24,7 +24,7 @@
# 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 839a4cd..7395db5 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -16,7 +16,7 @@
@rem if exist db-4.4.20 rd /s/q db-4.4.20
@rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0
@rem if exist openssl-0.9.8l rd /s/q openssl-0.9.8l
-@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9
+@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
@rem bzip
if not exist bzip2-1.0.5 (
@@ -39,7 +39,7 @@
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-3.5.9 (
+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.5.9
+ svn export http://svn.python.org/projects/external/sqlite-3.6.21
)