Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: Consume root-managed components from IDF Component Manager

Browse Source
This commit is contained in:
Daniel Paul
2026-08-18 20:51:54 +08:00
parent ab6a455b1a
commit b764f073ac
12 changed files with 194 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cmakev2/compat.cmake
+1
View File
@@ -945,6 +945,7 @@ endmacro()
Source of the component. One of:
* ``idf_components``
* ``idf_managed_components``
* ``project_managed_components``
* ``project_extra_components``
* ``project_components``
tools/cmakev2/component.cmake
+4 -2
View File
@@ -509,10 +509,12 @@ function(__get_component_priority)
endif()
if("${ARG_SOURCE}" STREQUAL "project_components")
set(priority 3)
set(priority 4)
elseif("${ARG_SOURCE}" STREQUAL "project_extra_components")
set(priority 2)
set(priority 3)
elseif("${ARG_SOURCE}" STREQUAL "project_managed_components")
set(priority 2)
elseif("${ARG_SOURCE}" STREQUAL "idf_managed_components")
set(priority 1)
elseif("${ARG_SOURCE}" STREQUAL "idf_components")
set(priority 0)
tools/cmakev2/manager.cmake
+17 -10
View File
@@ -25,9 +25,9 @@ function(__init_component_manager)
endif()
# Set IDF_COMPONENT_MANAGER_INTERFACE_VERSION.
# Defaults to 5. Allow overriding via env/CMake.
# Defaults to 6. Allow overriding via env/CMake.
__get_default_value(VARIABLE IDF_COMPONENT_MANAGER_INTERFACE_VERSION
DEFAULT 5
DEFAULT 6
OUTPUT cmgr_iface)
idf_build_set_property(IDF_COMPONENT_MANAGER_INTERFACE_VERSION ${cmgr_iface})
@@ -38,6 +38,17 @@ function(__init_component_manager)
idf_build_set_property(DEPENDENCIES_LOCK "${deps_lock_file}")
endfunction()
function(__component_manager_get_command var)
idf_build_get_property(python PYTHON)
if(DEFINED ENV{IDF_COMPONENT_WRAPPER} AND NOT "$ENV{IDF_COMPONENT_WRAPPER}" STREQUAL "")
set(component_manager_cmd
"${python}" "$ENV{IDF_COMPONENT_WRAPPER}" "idf_component_manager.prepare_components")
else()
set(component_manager_cmd "${python}" "-m" "idf_component_manager.prepare_components")
endif()
set(${var} ${component_manager_cmd} PARENT_SCOPE)
endfunction()
#[[
__fetch_components_from_registry()
@@ -135,14 +146,12 @@ function(__download_managed_component)
idf_die("RESULT option is required")
endif()
idf_build_get_property(python PYTHON)
__component_manager_get_command(component_manager_cmd)
idf_build_get_property(project_dir PROJECT_DIR)
idf_build_get_property(component_manager_interface_version IDF_COMPONENT_MANAGER_INTERFACE_VERSION)
idf_build_get_property(dependencies_lock_file DEPENDENCIES_LOCK)
# Invoke the component manager
execute_process(COMMAND ${python}
"-m"
"idf_component_manager.prepare_components"
execute_process(COMMAND ${component_manager_cmd}
"--project_dir=${project_dir}"
"--lock_path=${dependencies_lock_file}"
"--interface_version=${component_manager_interface_version}"
@@ -298,7 +307,6 @@ function(__inject_requirements_for_component_from_manager component_name)
idf_dbg("Injecting requirements for component '${component_name}' from the component manager")
idf_build_get_property(python PYTHON)
idf_build_get_property(project_dir PROJECT_DIR)
idf_build_get_property(build_dir BUILD_DIR)
idf_build_get_property(dependencies_lock_file DEPENDENCIES_LOCK)
@@ -355,9 +363,8 @@ function(__inject_requirements_for_component_from_manager component_name)
endif()
# Call component manager to inject requirements
execute_process(COMMAND ${python}
"-m"
"idf_component_manager.prepare_components"
__component_manager_get_command(component_manager_cmd)
execute_process(COMMAND ${component_manager_cmd}
"--project_dir=${project_dir}"
"--lock_path=${dependencies_lock_file}"
"--interface_version=${component_manager_interface_version}"