michaelh/zephyr
1
0
Fork 0
Code Releases Activity

doc: extensions: fix kconfig extension in parallel build environment

Browse source 
kconfig options should be *merged* instead of *appended*, otherwise
search index can be huge, among other side effects.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
This commit is contained in:
Benjamin Cabé 2024-08-14 18:28:25 +02:00 • committed by Anas Nashif
commit cb3ddf43e0
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/_extensions/zephyr/kconfig/__init__.py
View file

@ -231,14 +231,14 @@ class KconfigDomain(Domain):
object_types = {"option": ObjType("option", "option")} object_types = {"option": ObjType("option", "option")}
roles = {"option": XRefRole()} roles = {"option": XRefRole()}
directives = {"search": KconfigSearch} directives = {"search": KconfigSearch}
initial_data: Dict[str, Any] = {"options": []} initial_data: Dict[str, Any] = {"options": set()}
def get_objects(self) -> Iterable[Tuple[str, str, str, str, str, int]]: def get_objects(self) -> Iterable[Tuple[str, str, str, str, str, int]]:
for obj in self.data["options"]: for obj in self.data["options"]:
yield obj yield obj
def merge_domaindata(self, docnames: List[str], otherdata: Dict) -> None: def merge_domaindata(self, docnames: List[str], otherdata: Dict) -> None:
self.data["options"] += otherdata["options"] self.data["options"].update(otherdata["options"])
def resolve_xref( def resolve_xref(
self, self,
@ -268,7 +268,7 @@ class KconfigDomain(Domain):
def add_option(self, option): def add_option(self, option):
"""Register a new Kconfig option to the domain.""" """Register a new Kconfig option to the domain."""
self.data["options"].append( self.data["options"].add(
(option, option, "option", self.env.docname, option, 1) (option, option, "option", self.env.docname, option, 1)
) )