summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlend Egeberg Aasland <erlend.aasland@innova.no>2020-10-08 18:40:27 (GMT)
committerGitHub <noreply@github.com>2020-10-08 18:40:27 (GMT)
commitbfe6e03cd6931813dd61b50f5fdf7d8a8848f4cd (patch)
treec03ac47d344509080300d70bc65c5cadcd23595c
parent27ac19cca2c639caaf6fedf3632fe6beb265f24f (diff)
downloadcpython-bfe6e03cd6931813dd61b50f5fdf7d8a8848f4cd.zip
cpython-bfe6e03cd6931813dd61b50f5fdf7d8a8848f4cd.tar.gz
cpython-bfe6e03cd6931813dd61b50f5fdf7d8a8848f4cd.tar.bz2
bpo-41557: Update Windows installer to use SQLite 3.33.0 (GH-21960)
-rw-r--r--Misc/NEWS.d/next/Windows/2020-08-26-09-35-06.bpo-41557.vt00cQ.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/2020-08-26-09-35-06.bpo-41557.vt00cQ.rst b/Misc/NEWS.d/next/Windows/2020-08-26-09-35-06.bpo-41557.vt00cQ.rst
new file mode 100644
index 0000000..9d85461
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2020-08-26-09-35-06.bpo-41557.vt00cQ.rst
@@ -0,0 +1 @@
+Update Windows installer to use SQLite 3.33.0.
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index a48b59c..3bb2819 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
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1g
-set libraries=%libraries% sqlite-3.32.3.0
+set libraries=%libraries% sqlite-3.33.0.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 5f4926e..acc41a2 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -56,7 +56,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.32.3.0\</sqlite3Dir>
+ <sqlite3Dir>$(ExternalsDir)sqlite-3.33.0.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<libffiDir>$(ExternalsDir)libffi\</libffiDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index b884975..73833d5 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -185,7 +185,7 @@ _ssl
again when building.
_sqlite3
- Wraps SQLite 3.32.3.0, which is itself built by sqlite3.vcxproj
+ Wraps SQLite 3.33.0, which is itself built by sqlite3.vcxproj
Homepage:
http://www.sqlite.org/
_tkinter