Просмотр исходного кода

Merge branch 'bugfix/err_to_name_paths_windows_v4.0' into 'release/v4.0'

tools: fix path handling errors in gen_esp_err_to_name.py for Windows (v4.0)

See merge request espressif/esp-idf!10897
Angus Gratton 5 лет назад
Родитель
Сommit
74870e7e22
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      tools/gen_esp_err_to_name.py

+ 6 - 6
tools/gen_esp_err_to_name.py

@@ -40,17 +40,17 @@ import textwrap
 import functools
 
 # list files here which should not be parsed
-ignore_files = ['components/mdns/test_afl_fuzz_host/esp32_compat.h']
+ignore_files = [os.path.join('components', 'mdns', 'test_afl_fuzz_host', 'esp32_compat.h')]
 
-# add directories here which should not be parsed
-ignore_dirs = ('examples')
+# add directories here which should not be parsed,
+ignore_dirs = os.path.join('examples')
 
 # macros from here have higher priorities in case of collisions
-priority_headers = ['components/esp_common/include/esp_err.h']
+priority_headers = [os.path.join('components', 'esp_common', 'include', 'esp_err.h')]
 
 # The following headers won't be included. This is useful if they are permanently included from esp_err_to_name.c.in.
-dont_include = ['soc/soc.h',
-                'esp_err.h']
+dont_include = [os.path.join('soc', 'soc.h'),
+                os.path.join('esp_err.h')]
 
 err_dict = collections.defaultdict(list)  # identified errors are stored here; mapped by the error code
 rev_err_dict = dict()  # map of error string to error code