alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

tools: fixup version references related to paths with spaces

Browse Source 
The feature will only appear in 5.0 release, not in 4.4.
This commit is contained in:
Ivan Grokhotkov 2021-12-21 13:08:32 +01:00
parent aa1200607a
commit cf8fb9e950
No known key found for this signature in database
GPG Key ID: 1E050E141B280628
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/kconfig_new/prepare_kconfig_files.py
View File

@ -32,9 +32,8 @@ def _prepare_source_files(env_dict, list_separator):
source "var2" source "var2"
source "var3" source "var3"
The character used to delimit paths in COMPONENT_KCONFIGS* variables is determined based on The character used to delimit paths in COMPONENT_KCONFIGS* variables is set using --list-separator option.
presence of 'IDF_CMAKE' variable in the env_dict. Space separated lists are currently only used by the documentation build system (esp-docs).
GNU Make build system uses a space, CMake build system uses a semicolon.
""" """
def _dequote(var): def _dequote(var):

10
tools/split_paths_by_spaces.py
View File

@ -1,21 +1,21 @@
#!/usr/bin/env python #!/usr/bin/env python
# coding=utf-8 # coding=utf-8
# #
# SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
# This script converts space-separated EXTRA_COMPONENT_DIRS and COMPONENT_DIRS # This script converts space-separated EXTRA_COMPONENT_DIRS and COMPONENT_DIRS
# CMake variables into semicolon-separated lists. # CMake variables into semicolon-separated lists.
# #
# IDF versions <=v4.3 didn't support spaces in paths to ESP-IDF or projects. # IDF versions <=v4.4 didn't support spaces in paths to ESP-IDF or projects.
# Therefore it was okay to use spaces as separators in EXTRA_COMPONENT_DIRS, # Therefore it was okay to use spaces as separators in EXTRA_COMPONENT_DIRS,
# same as it was done in the legacy GNU Make based build system. # same as it was done in the legacy GNU Make based build system.
# CMake build system used 'spaces2list' function to convert space-separated # CMake build system used 'spaces2list' function to convert space-separated
# variables into semicolon-separated lists, replacing every space with a # variables into semicolon-separated lists, replacing every space with a
# semicolon. # semicolon.
# #
# In IDF 4.4 and later, spaces in project path and ESP-IDF path are supported. # In IDF 5.0 and later, spaces in project path and ESP-IDF path are supported.
# This means that EXTRA_COMPONENT_DIRS and COMPONENT_DIRS variables now should # This means that EXTRA_COMPONENT_DIRS and COMPONENT_DIRS variables now should
# be semicolon-separated CMake lists. # be semicolon-separated CMake lists.
# #
@ -69,7 +69,7 @@ def main() -> None:
if errors or ctx['warnings']: if errors or ctx['warnings']:
print(textwrap.dedent(""" print(textwrap.dedent("""
Note: In ESP-IDF v4.4 and later, COMPONENT_DIRS and EXTRA_COMPONENT_DIRS should be defined Note: In ESP-IDF v5.0 and later, COMPONENT_DIRS and EXTRA_COMPONENT_DIRS should be defined
as CMake lists, not as space separated strings. as CMake lists, not as space separated strings.
Examples: Examples:
@ -100,7 +100,7 @@ def main() -> None:
list(APPEND component2) list(APPEND component2)
Defining COMPONENT_DIRS and EXTRA_COMPONENT_DIRS as CMake lists is backwards compatible Defining COMPONENT_DIRS and EXTRA_COMPONENT_DIRS as CMake lists is backwards compatible
with ESP-IDF 4.3 and below. with ESP-IDF 4.4 and below.
(If you think these variables are defined correctly in your project and this message (If you think these variables are defined correctly in your project and this message
is not relevant, please report this as an issue.) is not relevant, please report this as an issue.)