From b2f88da2f849806c4773822ece6a016aeac87e30 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 4 May 2025 20:27:49 +0100 Subject: [PATCH 1/3] Update the PCbuild sub-projects list --- PCbuild/readme.txt | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 3bf215d907c52c..374ffdc5ac3c37 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -173,24 +173,31 @@ library which are implemented in C; each one builds a DLL (renamed to * _asyncio * _ctypes * _ctypes_test - * _zoneinfo * _decimal * _elementtree * _hashlib + * _lzma * _multiprocessing * _overlapped + * _queue + * _remotedebugging * _socket + * _sqlite3 + * _ssl * _testbuffer * _testcapi - * _testlimitedcapi - * _testinternalcapi * _testclinic * _testclinic_limited * _testconsole * _testimportmultiple + * _testinternalcapi + * _testlimitedcapi * _testmultiphase * _testsinglephase * _tkinter + * _uuid + * _wmi + * _zoneinfo * pyexpat * select * unicodedata @@ -202,15 +209,18 @@ interpreter, but they do implement several major features. See the "Getting External Sources" section below for additional information about getting the source for building these libraries. The sub-projects are: + _bz2 Python wrapper for version 1.0.8 of the libbzip2 compression library Homepage: http://www.bzip.org/ -_lzma + +liblzma Python wrapper for version 5.2.2 of the liblzma compression library Homepage: https://tukaani.org/xz/ -_ssl + +openssl Python wrapper for version 3.0.15 of the OpenSSL secure sockets library, which is downloaded from our binaries repository at https://github.com/python/cpython-bin-deps. @@ -229,10 +239,11 @@ _ssl As long as this folder exists, its contents will not be downloaded again when building. -_sqlite3 +sqlite3 Wraps SQLite 3.49.1, which is itself built by sqlite3.vcxproj Homepage: https://www.sqlite.org/ + _tkinter Wraps version 8.6.15 of the Tk windowing system, which is downloaded from our binaries repository at @@ -252,6 +263,7 @@ _tkinter Win32 and "tcltk64" on x64. They also copy the Tcl and Tk DLLs into the current output directory, which should ensure that Tkinter is able to load Tcl/Tk without having to change your PATH. + zlib-ng Compiles zlib-ng as a static library, which is later included by pythoncore.vcxproj. This was generated using CMake against zlib-ng From 09dbb403b0bbf6c087b19949f9e39a79f877c2f2 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 8 May 2025 10:25:07 +0100 Subject: [PATCH 2/3] Steve's feedback --- PCbuild/readme.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 374ffdc5ac3c37..6a908147894781 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -176,14 +176,11 @@ library which are implemented in C; each one builds a DLL (renamed to * _decimal * _elementtree * _hashlib - * _lzma * _multiprocessing * _overlapped * _queue - * _remotedebugging + * _remote_debugging * _socket - * _sqlite3 - * _ssl * _testbuffer * _testcapi * _testclinic @@ -194,7 +191,6 @@ library which are implemented in C; each one builds a DLL (renamed to * _testlimitedcapi * _testmultiphase * _testsinglephase - * _tkinter * _uuid * _wmi * _zoneinfo @@ -215,15 +211,16 @@ _bz2 Homepage: http://www.bzip.org/ -liblzma - Python wrapper for version 5.2.2 of the liblzma compression library +_lzma + Python wrapper for version 5.2.2 of the liblzma compression library, + which is itself built by liblzma.vcxproj. Homepage: https://tukaani.org/xz/ -openssl +_ssl Python wrapper for version 3.0.15 of the OpenSSL secure sockets - library, which is downloaded from our binaries repository at - https://github.com/python/cpython-bin-deps. + library, which is itself downloaded from our binaries repository at + https://github.com/python/cpython-bin-deps and built by openssl.vcxproj. Homepage: https://www.openssl.org/ @@ -239,7 +236,7 @@ openssl As long as this folder exists, its contents will not be downloaded again when building. -sqlite3 +_sqlite3 Wraps SQLite 3.49.1, which is itself built by sqlite3.vcxproj Homepage: https://www.sqlite.org/ @@ -256,7 +253,8 @@ _tkinter PCbuild\prepare_tcltk.bat. This will retrieve the version of the sources matched to the current commit from the Tcl and Tk branches in our source repository at - https://github.com/python/cpython-source-deps. + https://github.com/python/cpython-source-deps and build them via the + tcl.vcxproj and tk.vcxproj sub-projects. The two projects install their respective components in a directory alongside the source directories called "tcltk" on From 6fcafbc7e7edaae55e8cdf48c7f41ced2d439a31 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Thu, 8 May 2025 10:33:29 +0100 Subject: [PATCH 3/3] Add zstd entry --- PCbuild/readme.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 6a908147894781..8c33fec36b8a53 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -262,6 +262,11 @@ _tkinter into the current output directory, which should ensure that Tkinter is able to load Tcl/Tk without having to change your PATH. +_zstd + Python wrapper for version 1.5.7 of the zstd compression library + Homepage: + https://facebook.github.io/zstd/ + zlib-ng Compiles zlib-ng as a static library, which is later included by pythoncore.vcxproj. This was generated using CMake against zlib-ng