espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(tools): idf_tools.py install tool@version

Browse Source
This commit is contained in:
Marek Fiala
2025-05-16 11:19:52 +02:00
parent b861ac4481
commit bce8296ec7
1 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tools/idf_tools.py
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# coding=utf-8 # coding=utf-8
# #
# SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2019-2025 Espressif Systems (Shanghai) CO LTD
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@@ -793,13 +793,36 @@ class IDFTool(object):
return recommended_versions[0] return recommended_versions[0]
return None return None
def get_preferred_installed_version(self): # type: () -> Optional[str] def get_preferred_installed_version(self) -> Optional[str]:
recommended_versions = [k for k in self.versions_installed """
if self.versions[k].status == IDFToolVersion.STATUS_RECOMMENDED Get the preferred installed version of the tool.
and self.versions[k].compatible_with_platform(self._platform)] If more versions installed, return recommended version if exists, otherwise return the highest supported version
assert len(recommended_versions) <= 1 """
if recommended_versions:
return recommended_versions[0] self.find_installed_versions()
if self.get_recommended_version() in self.versions_installed:
return self.get_recommended_version()
supported_installed_versions = [
k
for k in self.versions_installed
if self.versions[k].status == IDFToolVersion.STATUS_SUPPORTED
and self.versions[k].compatible_with_platform(self._platform)
]
sorted_supported_installed_versions = sorted(
supported_installed_versions, key=lambda x: self.versions[x], reverse=True
)
if sorted_supported_installed_versions:
warn(
''.join(
[
f'Using supported version {sorted_supported_installed_versions[0]} for tool {self.name} ',
f'as recommended version {self.get_recommended_version()} is not installed.',
]
)
)
return sorted_supported_installed_versions[0]
return None return None
def find_installed_versions(self): # type: () -> None def find_installed_versions(self): # type: () -> None
@@ -845,8 +868,7 @@ class IDFTool(object):
if ver_str != version: if ver_str != version:
warn('tool {} version {} is installed, but has reported version {}'.format( warn('tool {} version {} is installed, but has reported version {}'.format(
self.name, version, ver_str)) self.name, version, ver_str))
else: self.versions_installed.append(version)
self.versions_installed.append(version)
def latest_installed_version(self): # type: () -> Optional[str] def latest_installed_version(self): # type: () -> Optional[str]
""" """
@@ -1502,6 +1524,9 @@ def expand_tools_arg(tools_spec, overall_tools, targets): # type: (list[str], O
# Filtering by ESP_targets # Filtering by ESP_targets
tools = [k for k in tools if overall_tools[k].is_supported_for_any_of_targets(targets)] tools = [k for k in tools if overall_tools[k].is_supported_for_any_of_targets(targets)]
# Processing specific version of tool - defined with '@'
tools.extend([tool_pattern for tool_pattern in tools_spec if '@' in tool_pattern])
return tools return tools
@@ -1795,7 +1820,6 @@ def process_tool(
tool_export_paths: List[str] = [] tool_export_paths: List[str] = []
tool_export_vars: Dict[str, str] = {} tool_export_vars: Dict[str, str] = {}
tool.find_installed_versions()
recommended_version_to_use = tool.get_preferred_installed_version() recommended_version_to_use = tool.get_preferred_installed_version()
if not tool.is_executable and recommended_version_to_use: if not tool.is_executable and recommended_version_to_use: