diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 2765b6a196d..06900840802 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -5,7 +5,7 @@ endif() set(PYTHON_VERSION_MAJOR 3) set(PYTHON_VERSION_MINOR 9) -set(PYTHON_VERSION_PATCH 6) +set(PYTHON_VERSION_PATCH 7) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -32,7 +32,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 a484de98044d180c3494ccf199f146516650cf7bc917b7d4a85f1e9b42b3938c2540f82298cb3f59332ae41c927e2335b4d91265de3496db4a14693a25a6a772 + SHA512 05de4e485fb6f5f21e4e48fb4d7ec0e9a420fab243cba08663e52b8062f86df3e4f57b8afd49ad94d363ca0972ab85efe132b980a7f84188c82814b6df0ba191 HEAD_REF master PATCHES ${PATCHES} ) @@ -62,10 +62,10 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) find_library(ZLIB_RELEASE NAMES zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ZLIB_DEBUG NAMES zlib zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) - configure_file(${SOURCE_PATH}/PC/pyconfig.h ${SOURCE_PATH}/PC/pyconfig.h) - configure_file(${CMAKE_CURRENT_LIST_DIR}/python_vcpkg.props.in ${SOURCE_PATH}/PCbuild/python_vcpkg.props) - configure_file(${CMAKE_CURRENT_LIST_DIR}/openssl.props.in ${SOURCE_PATH}/PCbuild/openssl.props) - file(WRITE ${SOURCE_PATH}/PCbuild/libffi.props + configure_file("${SOURCE_PATH}/PC/pyconfig.h" "${SOURCE_PATH}/PC/pyconfig.h") + configure_file("${CMAKE_CURRENT_LIST_DIR}/python_vcpkg.props.in" "${SOURCE_PATH}/PCbuild/python_vcpkg.props") + configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.props.in" "${SOURCE_PATH}/PCbuild/openssl.props") + file(WRITE "${SOURCE_PATH}/PCbuild/libffi.props" " " ) @@ -113,7 +113,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) endif() vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "PCbuild/pcbuild.proj" OPTIONS ${OPTIONS} LICENSE_SUBPATH "LICENSE" @@ -166,7 +166,7 @@ else() endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} OPTIONS_DEBUG "--with-pydebug" ) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 84aec1b9a3a..5803414a87d 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "python3", - "version-semver": "3.9.6", + "version-semver": "3.9.7", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", @@ -34,6 +34,14 @@ "name": "sqlite3", "platform": "!(windows & static)" }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 7740f5dec3f..a75e3c6be81 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -149,17 +149,17 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "PYTHON3") if(CMAKE_HOST_WIN32) set(PROGNAME python) - set(PYTHON_VERSION 3.9.6) + set(PYTHON_VERSION 3.9.7) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) set(SUBDIR "python-${PYTHON_VERSION}-x86") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-win32.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-win32.zip") - set(HASH 4b2a0670094e639dcb2b762a02de8cdadd0af3657c463d9ff45af2541c0306496b991ae5402f119443ca891e918685bb57d18f13975f0493d349d864ff3e3a2c) + set(HASH 5f12f693c6df68b75f96b797740a156f2dcd471e96e7980a6e297bbfd064467ba2b2cc9d2f450296388402a8a0b716fce1c4a25b94b50615503d528e33fea870) else() set(SUBDIR "python-${PYTHON_VERSION}-x64") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-amd64.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-amd64.zip") - set(HASH f8946471ed7dbc8cbffc72298f99330794b127ce6aa60abc87e80b31bd26099a2f637db85af88ce78c06dcf6e19064184ef3768edf4b1a0f97c25898e379d121) + set(HASH 482765de165863f86637591d57141930e2c4ca6e210d0c2569bd0e5fe63157966fb44dea0d5adf249ff15ec9c50cb2dddb704c4ea79369d598f348ee5406f160) endif() set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python39._pth) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index ea5c221d99f..fc07adeb512 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,11 +1,11 @@ - 3.9.6 + 3.9.7 python.exe - https://www.python.org/ftp/python/3.9.6/python-3.9.6-embed-win32.zip - 4b2a0670094e639dcb2b762a02de8cdadd0af3657c463d9ff45af2541c0306496b991ae5402f119443ca891e918685bb57d18f13975f0493d349d864ff3e3a2c - python-3.9.6-embed-win32.zip + https://www.python.org/ftp/python/3.9.7/python-3.9.7-embed-win32.zip + 5f12f693c6df68b75f96b797740a156f2dcd471e96e7980a6e297bbfd064467ba2b2cc9d2f450296388402a8a0b716fce1c4a25b94b50615503d528e33fea870 + python-3.9.7-embed-win32.zip 3.21.1 diff --git a/versions/baseline.json b/versions/baseline.json index c848cb73407..79447f57aed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5225,7 +5225,7 @@ "port-version": 1 }, "python3": { - "baseline": "3.9.6", + "baseline": "3.9.7", "port-version": 0 }, "qca": { diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 6b75aa7fcf7..34194e0abba 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3a545b39c982b7f0a12891765dd9909e364ebc6", + "version-semver": "3.9.7", + "port-version": 0 + }, { "git-tree": "0628d684afd26b15be6a1a6bb162e56744a442a7", "version-semver": "3.9.6",