summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlend Egeberg Aasland <erlend.aasland@innova.no>2021-09-20 15:58:13 (GMT)
committerGitHub <noreply@github.com>2021-09-20 15:58:13 (GMT)
commit5846c9b71ee9277fe866b1bdee4cc6702323fe7e (patch)
tree6dbf74dd8ca75f4294daccf70f8856cbe5a25efd
parente6ba992288fdbe71aa808cfb6955f6f99da7e349 (diff)
downloadcpython-5846c9b71ee9277fe866b1bdee4cc6702323fe7e.zip
cpython-5846c9b71ee9277fe866b1bdee4cc6702323fe7e.tar.gz
cpython-5846c9b71ee9277fe866b1bdee4cc6702323fe7e.tar.bz2
bpo-44848: Update Windows installer to use SQLite 3.36.0 (GH-27622)
-rw-r--r--Misc/NEWS.d/next/Windows/2021-08-06-10-11-07.bpo-44848.ib3Jcz.rst1
-rw-r--r--PCbuild/get_externals.bat2
-rw-r--r--PCbuild/python.props2
-rw-r--r--PCbuild/readme.txt2
4 files changed, 4 insertions, 3 deletions
diff --git a/Misc/NEWS.d/next/Windows/2021-08-06-10-11-07.bpo-44848.ib3Jcz.rst b/Misc/NEWS.d/next/Windows/2021-08-06-10-11-07.bpo-44848.ib3Jcz.rst
new file mode 100644
index 0000000..6eadfed
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2021-08-06-10-11-07.bpo-44848.ib3Jcz.rst
@@ -0,0 +1 @@
+Upgrade Windows installer to use SQLite 3.36.0.
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 8fa2993..b3e557e 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,7 +54,7 @@ set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.2
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1l
-set libraries=%libraries% sqlite-3.35.5.0
+set libraries=%libraries% sqlite-3.36.0.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.11.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 686d3ff..142c12a 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -57,7 +57,7 @@
<ExternalsDir>$(EXTERNALS_DIR)</ExternalsDir>
<ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
- <sqlite3Dir>$(ExternalsDir)sqlite-3.35.5.0\</sqlite3Dir>
+ <sqlite3Dir>$(ExternalsDir)sqlite-3.36.0.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<libffiDir>$(ExternalsDir)libffi-3.4.2\</libffiDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 5ecded0..26b42a8 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -189,7 +189,7 @@ _ssl
again when building.
_sqlite3
- Wraps SQLite 3.35.5, which is itself built by sqlite3.vcxproj
+ Wraps SQLite 3.36.0, which is itself built by sqlite3.vcxproj
Homepage:
http://www.sqlite.org/
_tkinter