diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2022-05-02 15:02:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-02 15:02:54 (GMT) |
| commit | e6040604b3e12a2897274ed6c715c45eea524cb5 (patch) | |
| tree | 08ecd09967e10d3f74d8b625d0427c30b12940bb | |
| parent | bb857a96ef368ba9de1da2db12b1a1f1870606ac (diff) | |
| download | cpython-e6040604b3e12a2897274ed6c715c45eea524cb5.zip cpython-e6040604b3e12a2897274ed6c715c45eea524cb5.tar.gz cpython-e6040604b3e12a2897274ed6c715c45eea524cb5.tar.bz2 | |
bpo-46907: Update Windows installer to SQLite 3.38.3. (GH-91995)
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2022-04-27-19-36-56.bpo-46907.lfurlP.rst | 1 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 | ||||
| -rw-r--r-- | PCbuild/sqlite3.vcxproj | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/Misc/NEWS.d/next/Windows/2022-04-27-19-36-56.bpo-46907.lfurlP.rst b/Misc/NEWS.d/next/Windows/2022-04-27-19-36-56.bpo-46907.lfurlP.rst new file mode 100644 index 0000000..88ea9f9 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2022-04-27-19-36-56.bpo-46907.lfurlP.rst @@ -0,0 +1 @@ +Update Windows installer to use SQLite 3.38.3. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 35646ed..4241baa 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ set libraries= set libraries=%libraries% bzip2-1.0.8 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.2 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1n -set libraries=%libraries% sqlite-3.38.2.0 +set libraries=%libraries% sqlite-3.38.3.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6 diff --git a/PCbuild/python.props b/PCbuild/python.props index baa6526..e50fdc0 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -61,7 +61,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.38.2.0\</sqlite3Dir> + <sqlite3Dir>$(ExternalsDir)sqlite-3.38.3.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir> <lzmaDir>$(ExternalsDir)xz-5.2.5\</lzmaDir> <libffiDir>$(ExternalsDir)libffi-3.4.2\</libffiDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 4c99b86..da8947c 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -189,7 +189,7 @@ _ssl again when building. _sqlite3 - Wraps SQLite 3.38.2, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.38.3, which is itself built by sqlite3.vcxproj Homepage: http://www.sqlite.org/ _tkinter diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj index 310795c..c502d51 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -98,7 +98,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_JSON1;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level1</WarningLevel> </ClCompile> <ResourceCompile> |