Skip to content

Commit

Permalink
bpo-41557: Update Windows installer to use SQLite 3.33.0 (GH-21960)
Browse files Browse the repository at this point in the history
(cherry picked from commit bfe6e03)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
  • Loading branch information
miss-islington and Erlend Egeberg Aasland committed Oct 8, 2020
1 parent a4ac5fa commit 089c386
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
@@ -0,0 +1 @@
Update Windows installer to use SQLite 3.33.0.
2 changes: 1 addition & 1 deletion PCbuild/get_externals.bat
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/python.props
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/readme.txt
Expand Up @@ -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
Expand Down

0 comments on commit 089c386

Please sign in to comment.