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

Merge branch 'bugfix/cmake_utf_decode_v3.2' into 'release/v3.2'

Browse Source 
tools: Fix Unicode decode error & indentation error (backport v3.2)

See merge request idf/esp-idf!3733
This commit is contained in:
Ivan Grokhotkov
2018-11-21 11:44:54 +08:00
parent 6681096e55 f3c1903791
commit d57ea422be
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/cmake/convert_to_cmake.py
View File

@@ -42,7 +42,7 @@ def get_make_variables(path, makefile="Makefile", expected_failure=False, variab
result = {} result = {}
BUILT_IN_VARS = set(["MAKEFILE_LIST", "SHELL", "CURDIR", "MAKEFLAGS"]) BUILT_IN_VARS = set(["MAKEFILE_LIST", "SHELL", "CURDIR", "MAKEFLAGS"])
for line in output.decode().split("\n"): for line in output.decode('utf-8').split("\n"):
if line.startswith("# makefile"): # this line appears before any variable defined in the makefile itself if line.startswith("# makefile"): # this line appears before any variable defined in the makefile itself
next_is_makefile = True next_is_makefile = True
elif next_is_makefile: elif next_is_makefile:
@@ -92,8 +92,8 @@ def get_component_variables(project_path, component_path):
srcs += glob.glob(os.path.join(component_srcdir_path, "*.cpp")) srcs += glob.glob(os.path.join(component_srcdir_path, "*.cpp"))
srcs = [('"%s"' % str(os.path.relpath(s, component_path))) for s in srcs] srcs = [('"%s"' % str(os.path.relpath(s, component_path))) for s in srcs]
make_vars["COMPONENT_ADD_INCLUDEDIRS"] = make_vars.get("COMPONENT_ADD_INCLUDEDIRS", "include") make_vars["COMPONENT_ADD_INCLUDEDIRS"] = make_vars.get("COMPONENT_ADD_INCLUDEDIRS", "include")
component_srcs += srcs component_srcs += srcs
make_vars["COMPONENT_SRCS"] = " ".join(component_srcs) make_vars["COMPONENT_SRCS"] = " ".join(component_srcs)