bpo-35360: Update Windows builds to use SQLite 3.28.0 (GH-14179)

This commit is contained in:
animalize 2019-06-25 07:22:14 +08:00 committed by Steve Dower
parent 6793cce155
commit 7fd2ba354e
4 changed files with 4 additions and 3 deletions

View File

@ -0,0 +1 @@
Update Windows builds to use SQLite 3.28.0.

View File

@ -54,7 +54,7 @@ set libraries=
set libraries=%libraries% bzip2-1.0.6 set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0-rc0-r1 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0-rc0-r1
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1c if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1c
set libraries=%libraries% sqlite-3.21.0.0 set libraries=%libraries% sqlite-3.28.0.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.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% tk-8.6.9.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6

View File

@ -56,7 +56,7 @@
<ExternalsDir>$(EXTERNALS_DIR)</ExternalsDir> <ExternalsDir>$(EXTERNALS_DIR)</ExternalsDir>
<ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir> <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir> <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.21.0.0\</sqlite3Dir> <sqlite3Dir>$(ExternalsDir)sqlite-3.28.0.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir> <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<libffiDir>$(ExternalsDir)libffi\</libffiDir> <libffiDir>$(ExternalsDir)libffi\</libffiDir>

View File

@ -184,7 +184,7 @@ _ssl
again when building. again when building.
_sqlite3 _sqlite3
Wraps SQLite 3.21.0.0, which is itself built by sqlite3.vcxproj Wraps SQLite 3.28.0.0, which is itself built by sqlite3.vcxproj
Homepage: Homepage:
http://www.sqlite.org/ http://www.sqlite.org/
_tkinter _tkinter