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

Merge branch 'feat/min_config_labels' into 'master'

feat(tools/kconfig): add menu labels for min config

Closes IDFGH-8945

See merge request espressif/esp-idf!26312
Roland Dobai 2 лет назад
Родитель
Сommit
44fcbe2ea4
1 измененных файлов с 14 добавлено и 2 удалено
  1. 14 2
      tools/idf_py_actions/core_ext.py

+ 14 - 2
tools/idf_py_actions/core_ext.py

@@ -77,6 +77,14 @@ def action_extensions(base_actions: Dict, project_path: str) -> Any:
         args.no_hints = True
         build_target(target_name, ctx, args)
 
+    def save_defconfig(target_name: str, ctx: Context, args: PropertyDict, menu_labels: bool) -> None:
+        if menu_labels:
+            os.environ['ESP_IDF_KCONFIG_MIN_LABELS'] = '1'
+        else:
+            # unset variable
+            os.environ.pop('ESP_IDF_KCONFIG_MIN_LABELS', None)
+        build_target(target_name, ctx, args)
+
     def fallback_target(target_name: str, ctx: Context, args: PropertyDict) -> None:
         """
         Execute targets that are not explicitly known to idf.py
@@ -491,9 +499,13 @@ def action_extensions(base_actions: Dict, project_path: str) -> Any:
                 ]
             },
             'save-defconfig': {
-                'callback': build_target,
+                'callback': save_defconfig,
                 'help': 'Generate a sdkconfig.defaults with options different from the default ones',
-                'options': global_options
+                'options': global_options + [{
+                    'names': ['--add-menu-labels'],
+                    'is_flag': True,
+                    'help': 'Add menu labels to minimal config.',
+                }]
             }
         }
     }