Skip to content

bpo-28791: Update Windows installer to use SQLite 3.21.0. #4246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mariatta merged 2 commits into from
Nov 7, 2017
Merged

bpo-28791: Update Windows installer to use SQLite 3.21.0. #4246

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9e70a4
bpo-28791: Update Windows installer to use SQLite 3.21.0.
Mariatta Nov 3, 2017
7795a27
Update the news description: "builds" instead of "installer".
Mariatta Nov 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bpo-28791: Update Windows installer to use SQLite 3.21.0.
  • Loading branch information
@Mariatta
Mariatta committed Nov 4, 2017
commit f9e70a45d3920caaeaaeb2dac1eb46b52cc85a0d
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Build/2017-11-02-20-30-57.bpo-28791.VaE3o8.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update Windows installer to use SQLite 3.21.0.
Copy link
Copy Markdown
Member

@zooba zooba Nov 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would make this "Windows builds" - the installer doesn't have anything to do with SQLite.

Copy link
Copy Markdown
Member Author

@Mariatta Mariatta Nov 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

2 changes: 1 addition & 1 deletion PCbuild/get_externals.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ echo.Fetching external libraries...
set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0f
set libraries=%libraries% sqlite-3.14.2.0
set libraries=%libraries% sqlite-3.21.0.0
Copy link
Copy Markdown
Member

@zooba zooba Nov 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zware Have you pushed sources up here yet? I haven't.

Copy link
Copy Markdown
Member

@zware zware Nov 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not. @Mariatta, if you'd like to do so, the undocumented process is:

  1. clone cpython-source-deps
  2. check out the sqlite branch
  3. download the sqlite source from sqlite.org
  4. unzip it into the cpython-source-deps checkout
  5. commit, push (as a PR if you'd like confirmation from @zooba or me; base the PR on the sqlite branch)
  6. tag the commit as sqlite-<full version specified in PCbuild/get_externals.bat`

After that, convince AppVeyor to run it again and all should be good. This can all be done from non-Windows.

Copy link
Copy Markdown
Member Author

@Mariatta Mariatta Nov 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @zware and @zooba. I made the PR in cpython-source-deps repo.
🤔 Where should the above steps be documented? Dev Guide?

Copy link
Copy Markdown
Member

@zware zware Nov 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Devguide would be the right place, but where in the devguide I have no idea :)

if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.6.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/python.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

<!-- Directories of external projects. tcltk is handled in tcltk.props -->
<ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.21.0.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<opensslDir>$(ExternalsDir)openssl-1.1.0f\</opensslDir>
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ _ssl
again when building.

_sqlite3
Wraps SQLite 3.14.2.0, which is itself built by sqlite3.vcxproj
Wraps SQLite 3.21.0.0, which is itself built by sqlite3.vcxproj
Homepage:
http://www.sqlite.org/
_tkinter
Expand Down