changeset:   104453:3e329b553567
parent:      104451:fea9ff9e745d
parent:      104452:b7e068d6c53f
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Mon Oct 10 22:37:29 2016 -0500
files:       Misc/NEWS PCbuild/readme.txt
description:
Issue #28208: Merge with 3.6


diff -r fea9ff9e745d -r 3e329b553567 Misc/NEWS
--- a/Misc/NEWS	Mon Oct 10 22:28:39 2016 -0500
+++ b/Misc/NEWS	Mon Oct 10 22:37:29 2016 -0500
@@ -262,6 +262,8 @@
 Build
 -----
 
+- Issue #28208: Update Windows build to use SQLite 3.14.2.0.
+
 - Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
 
 - Issue #21124: Fix building the _struct module on Cygwin by passing ``NULL``
diff -r fea9ff9e745d -r 3e329b553567 PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Mon Oct 10 22:28:39 2016 -0500
+++ b/PCbuild/get_externals.bat	Mon Oct 10 22:37:29 2016 -0500
@@ -55,7 +55,7 @@
 set libraries=%libraries%                                    bzip2-1.0.6
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2j
-set libraries=%libraries%                                    sqlite-3.14.1.0
+set libraries=%libraries%                                    sqlite-3.14.2.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6
diff -r fea9ff9e745d -r 3e329b553567 PCbuild/python.props
--- a/PCbuild/python.props	Mon Oct 10 22:28:39 2016 -0500
+++ b/PCbuild/python.props	Mon Oct 10 22:37:29 2016 -0500
@@ -42,7 +42,7 @@
     
     <!-- Directories of external projects. tcltk is handled in tcltk.props -->
     <ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir>
-    <sqlite3Dir>$(ExternalsDir)sqlite-3.14.1.0\</sqlite3Dir>
+    <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
     <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
diff -r fea9ff9e745d -r 3e329b553567 PCbuild/readme.txt
--- a/PCbuild/readme.txt	Mon Oct 10 22:28:39 2016 -0500
+++ b/PCbuild/readme.txt	Mon Oct 10 22:37:29 2016 -0500
@@ -204,7 +204,7 @@
     functionality to _ssl or _hashlib. They will not clean up their output
     with the normal Clean target; CleanAll should be used instead.
 _sqlite3
-    Wraps SQLite 3.14.1.0, which is itself built by sqlite3.vcxproj
+    Wraps SQLite 3.14.2.0, which is itself built by sqlite3.vcxproj
     Homepage:
         http://www.sqlite.org/
 _tkinter