traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #28208: Merge with 3.6

This commit is contained in:
Zachary Ware 2016-10-10 22:37:29 -05:00
parent 0732fd62d9 547d156c2c
commit 8d794d66bd
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -262,6 +262,8 @@ Windows
Build
-----
- Issue #28208: Update Windows build to use SQLite 3.14.2.0.
- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
- Issue #21124: Fix building the _struct module on Cygwin by passing ``NULL``

2
PCbuild/get_externals.bat
View File

@ -55,7 +55,7 @@ set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j
set libraries=%libraries% sqlite-3.14.1.0
set libraries=%libraries% sqlite-3.14.2.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6

2
PCbuild/python.props
View File

@ -42,7 +42,7 @@
<!-- Directories of external projects. tcltk is handled in tcltk.props -->
<ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.14.1.0\</sqlite3Dir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>

2
PCbuild/readme.txt
View File

@ -204,7 +204,7 @@ _ssl
functionality to _ssl or _hashlib. They will not clean up their output
with the normal Clean target; CleanAll should be used instead.
_sqlite3
Wraps SQLite 3.14.1.0, which is itself built by sqlite3.vcxproj
Wraps SQLite 3.14.2.0, which is itself built by sqlite3.vcxproj
Homepage:
http://www.sqlite.org/
_tkinter