diff options
| author |   Chris Luke <chrisy@flirble.org> | 2016-09-26 15:51:56 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2016-09-27 18:15:58 +0000 |
| commit | af405f77c74d8b41523d4e7f39a91c7aec2fd93c (patch) | |
| tree | 503790bbfaf0a6aee1956c1f4e8e0efc81fb586c /doxygen | |
| parent | 822af5c95d080a58cda504228df4b5f3896e72b6 (diff) | |
Fix missing output in generated CLI/config
The templates were looking for the name of the CLI_COMMAND
and CONFIG_FUNCTION structures in the srong place.
Change-Id: I709d6716216173ba6a7ed41a260728238f96d2db
Signed-off-by: Chris Luke <chrisy@flirble.org>
Diffstat (limited to 'doxygen')
| -rw-r--r-- | doxygen/siphon/process.py | 1 | ||||
| -rw-r--r-- | doxygen/siphon_templates/clicmd/item_format.md | 8 | ||||
| -rw-r--r-- | doxygen/siphon_templates/syscfg/item_format.md | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/doxygen/siphon/process.py b/doxygen/siphon/process.py index c7f8f1a2..34e829c5 100644 --- a/doxygen/siphon/process.py +++ b/doxygen/siphon/process.py @@ -257,6 +257,7 @@ class Siphon(object): "directory": o['meta']['directory'], "file": o['meta']['file'], "macro": o['macro'], + "name": o['name'], "key": key, "label": self.item_label(group, key), } diff --git a/doxygen/siphon_templates/clicmd/item_format.md b/doxygen/siphon_templates/clicmd/item_format.md index 77d0484b..288dae40 100644 --- a/doxygen/siphon_templates/clicmd/item_format.md +++ b/doxygen/siphon_templates/clicmd/item_format.md @@ -31,7 +31,7 @@ ### Long help {{ v['long_help'] }} -{%- endif %} +{% endif %} {% if 'siphon_block' in item['meta'] %} {% set sb = item["meta"]["siphon_block"] %} {% if sb %} @@ -42,14 +42,14 @@ {{ sb }} {% endif %} {% endif %} -{% if "item" in meta or "function" in v %} +{% if 'name' in meta or 'function' in v %} {# Gives some developer-useful linking #} ### Declaration and implementation -{% if "item" in meta %} +{% if "name" in meta %} {{ "Declaration: @ref %s (@ref %s line %d)" % - (meta['item'], meta["file"], item["meta"]["line_start"]) }} + (meta['name'], meta["file"], item["meta"]["line_start"]) }} {% endif %} {% if "function" in v %} diff --git a/doxygen/siphon_templates/syscfg/item_format.md b/doxygen/siphon_templates/syscfg/item_format.md index 5d3bb5c8..53136115 100644 --- a/doxygen/siphon_templates/syscfg/item_format.md +++ b/doxygen/siphon_templates/syscfg/item_format.md @@ -25,14 +25,14 @@ {{ sb }} {% endif %} {% endif %} -{% if "item" in meta or "function" in item %} +{% if "name" in meta or "function" in item %} {# Gives some developer-useful linking #} ### Declaration and implementation -{% if "item" in meta %} +{% if "name" in meta %} {{ "Declaration: @ref %s (@ref %s line %d)" % - (meta['item'], meta["file"], item["meta"]["line_start"]) }} + (meta['name'], meta["file"], item["meta"]["line_start"]) }} {% endif %} {% if "function" in item %} |