Skip to content

Commit

Permalink
kconfiglib: Update to 2259d353426f1
Browse files Browse the repository at this point in the history
Update Kconfiglib to upstream revision 2259d353426f1 (+ local Zephyr
modifications) to get commit 2259d353426f1 ("Generalize is_menuconfig to
non-symbol items") in. It will be used by the menuconfig implementation.

Origin: https://github.com/zephyrproject-rtos/Kconfiglib/tree/zephyr

Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
  • Loading branch information
ulfalizer authored and Anas Nashif committed Apr 4, 2018
1 parent bdd03f3 commit 46a172a
Showing 1 changed file with 17 additions and 6 deletions.
23 changes: 17 additions & 6 deletions scripts/kconfig/kconfiglib.py
Expand Up @@ -1827,11 +1827,11 @@ def _parse_block(self, end_token, parent, prev, visible_if_deps):
node = MenuNode()
node.kconfig = self
node.item = sym
node.is_menuconfig = (t0 == _T_MENUCONFIG)
node.prompt = node.help = node.list = None
node.parent = parent
node.filename = self._filename
node.linenr = self._linenr
node.is_menuconfig = (t0 == _T_MENUCONFIG)

sym.nodes.append(node)

Expand Down Expand Up @@ -1915,6 +1915,7 @@ def _parse_block(self, end_token, parent, prev, visible_if_deps):
node = MenuNode()
node.kconfig = self
node.item = MENU
node.is_menuconfig = True
node.visibility = self.y
node.parent = parent
node.filename = self._filename
Expand All @@ -1935,6 +1936,7 @@ def _parse_block(self, end_token, parent, prev, visible_if_deps):
node = MenuNode()
node.kconfig = self
node.item = COMMENT
node.is_menuconfig = False
node.list = None
node.parent = parent
node.filename = self._filename
Expand Down Expand Up @@ -1966,6 +1968,7 @@ def _parse_block(self, end_token, parent, prev, visible_if_deps):
node.kconfig = self
node.item = choice
node.prompt = node.help = None
node.is_menuconfig = True
node.parent = parent
node.filename = self._filename
node.linenr = self._linenr
Expand Down Expand Up @@ -3913,11 +3916,19 @@ class MenuNode(object):
symbols and choices within the menu.
is_menuconfig:
True if the symbol for the menu node (it must be a symbol) was defined
with 'menuconfig' rather than 'config' (at this location). This is a hint
on how to display the menu entry (display the children in a separate menu
rather than indenting them). It's ignored internally by Kconfiglib,
except when printing symbols.
Set to True if the children of the menu node should be displayed in a
separate menu. This is the case for the following items:
- Menus (node.item == MENU)
- Choices
- Symbols defined with the 'menuconfig' keyword. The children come from
implicitly created submenus, and should be displayed in a separate
menu rather than being indented.
'is_menuconfig' is just a hint on how to display the menu node. It's
ignored internally by Kconfiglib, except when printing symbols.
filename/linenr:
The location where the menu node appears.
Expand Down

0 comments on commit 46a172a

Please sign in to comment.