Skip to content

Commit 5b56e4d

Browse files
kartbendanieldegrasse
authored andcommitted
.github: workflows: Bump Doxygen to 1.14 from 1.12
Doxygen 1.14 comes with really useful UX improvements which we want to benefit from in our API documentation so update the CI job accordingly. Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
1 parent 86bea34 commit 5b56e4d

File tree

3 files changed

+102
-51
lines changed

3 files changed

+102
-51
lines changed

.github/workflows/doc-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ permissions:
1515
contents: read
1616

1717
env:
18-
DOXYGEN_VERSION: 1.12.0
19-
DOXYGEN_MD5SUM: fd96a5defa535dfe2e987b46540844a4
18+
DOXYGEN_VERSION: 1.14.0
19+
DOXYGEN_MD5SUM: e761a5097ae20ecccfd02041925f102a
2020
JOB_COUNT: 4
2121

2222
jobs:

doc/_doxygen/header.html

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- HTML header for doxygen 1.12.0-->
1+
<!-- HTML header for doxygen 1.14.0-->
22
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
33
<html xmlns="http://www.w3.org/1999/xhtml" lang="$langISO">
44
<head>
@@ -12,11 +12,9 @@
1212
<link rel="icon" href="$relpath^$projecticon" type="image/x-icon" />
1313
<!--END PROJECT_ICON-->
1414
<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
15-
<!--BEGIN DISABLE_INDEX-->
16-
<!--BEGIN FULL_SIDEBAR-->
15+
<!--BEGIN FULL_SIDEBAR-->
1716
<script type="text/javascript">var page_layout=1;</script>
18-
<!--END FULL_SIDEBAR-->
19-
<!--END DISABLE_INDEX-->
17+
<!--END FULL_SIDEBAR-->
2018
<script type="text/javascript" src="$relpath^jquery.js"></script>
2119
<script type="text/javascript" src="$relpath^dynsections.js"></script>
2220
<!--BEGIN COPY_CLIPBOARD-->
@@ -35,11 +33,9 @@
3533
$extrastylesheet
3634
</head>
3735
<body>
38-
<!--BEGIN DISABLE_INDEX-->
39-
<!--BEGIN FULL_SIDEBAR-->
36+
<!--BEGIN FULL_SIDEBAR-->
4037
<div id="side-nav" class="ui-resizable side-nav-resizable"><!-- do not remove this div, it is closed by doxygen! -->
41-
<!--END FULL_SIDEBAR-->
42-
<!--END DISABLE_INDEX-->
38+
<!--END FULL_SIDEBAR-->
4339

4440
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
4541

doc/zephyr.doxyfile.in

Lines changed: 95 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Doxyfile 1.12.0
1+
# Doxyfile 1.14.0
22

33
# This file describes the settings to be used by the documentation system
44
# Doxygen (www.doxygen.org) for a project.
@@ -80,7 +80,7 @@ OUTPUT_DIRECTORY = @DOXY_OUT@
8080
# sub-directories (in 2 levels) under the output directory of each output format
8181
# and will distribute the generated files over these directories. Enabling this
8282
# option can be useful when feeding Doxygen a huge amount of source files, where
83-
# putting all generated files in the same directory would otherwise causes
83+
# putting all generated files in the same directory would otherwise cause
8484
# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
8585
# control the number of sub-directories.
8686
# The default value is: NO.
@@ -199,10 +199,10 @@ STRIP_FROM_INC_PATH =
199199
SHORT_NAMES = NO
200200

201201
# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen will interpret the
202-
# first line (until the first dot) of a Javadoc-style comment as the brief
203-
# description. If set to NO, the Javadoc-style will behave just like regular Qt-
204-
# style comments (thus requiring an explicit @brief command for a brief
205-
# description.)
202+
# first line (until the first dot, question mark or exclamation mark) of a
203+
# Javadoc-style comment as the brief description. If set to NO, the Javadoc-
204+
# style will behave just like regular Qt-style comments (thus requiring an
205+
# explicit @brief command for a brief description.)
206206
# The default value is: NO.
207207

208208
JAVADOC_AUTOBRIEF = YES
@@ -218,9 +218,10 @@ JAVADOC_AUTOBRIEF = YES
218218
JAVADOC_BANNER = NO
219219

220220
# If the QT_AUTOBRIEF tag is set to YES then Doxygen will interpret the first
221-
# line (until the first dot) of a Qt-style comment as the brief description. If
222-
# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
223-
# requiring an explicit \brief command for a brief description.)
221+
# line (until the first dot, question mark or exclamation mark) of a Qt-style
222+
# comment as the brief description. If set to NO, the Qt-style will behave just
223+
# like regular Qt-style comments (thus requiring an explicit \brief command for
224+
# a brief description.)
224225
# The default value is: NO.
225226

226227
QT_AUTOBRIEF = YES
@@ -388,11 +389,20 @@ MARKDOWN_ID_STYLE = DOXYGEN
388389
# When enabled Doxygen tries to link words that correspond to documented
389390
# classes, or namespaces to their corresponding documentation. Such a link can
390391
# be prevented in individual cases by putting a % sign in front of the word or
391-
# globally by setting AUTOLINK_SUPPORT to NO.
392+
# globally by setting AUTOLINK_SUPPORT to NO. Words listed in the
393+
# AUTOLINK_IGNORE_WORDS tag are excluded from automatic linking.
392394
# The default value is: YES.
393395

394396
AUTOLINK_SUPPORT = YES
395397

398+
# This tag specifies a list of words that, when matching the start of a word in
399+
# the documentation, will suppress auto links generation, if it is enabled via
400+
# AUTOLINK_SUPPORT. This list does not affect links explicitly created using \#
401+
# or the \link or commands.
402+
# This tag requires that the tag AUTOLINK_SUPPORT is set to YES.
403+
404+
AUTOLINK_IGNORE_WORDS =
405+
396406
# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
397407
# to include (a tag file for) the STL sources as input, then you should set this
398408
# tag to YES in order to let Doxygen match functions declarations and
@@ -604,6 +614,14 @@ HIDE_UNDOC_MEMBERS = NO
604614

605615
HIDE_UNDOC_CLASSES = NO
606616

617+
# If the HIDE_UNDOC_NAMESPACES tag is set to YES, Doxygen will hide all
618+
# undocumented namespaces that are normally visible in the namespace hierarchy.
619+
# If set to NO, these namespaces will be included in the various overviews. This
620+
# option has no effect if EXTRACT_ALL is enabled.
621+
# The default value is: YES.
622+
623+
HIDE_UNDOC_NAMESPACES = YES
624+
607625
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all friend
608626
# declarations. If set to NO, these declarations will be included in the
609627
# documentation.
@@ -914,6 +932,14 @@ WARN_NO_PARAMDOC = NO
914932

915933
WARN_IF_UNDOC_ENUM_VAL = NO
916934

935+
# If WARN_LAYOUT_FILE option is set to YES, Doxygen will warn about issues found
936+
# while parsing the user defined layout file, such as missing or wrong elements.
937+
# See also LAYOUT_FILE for details. If set to NO, problems with the layout file
938+
# will be suppressed.
939+
# The default value is: YES.
940+
941+
WARN_LAYOUT_FILE = YES
942+
917943
# If the WARN_AS_ERROR tag is set to YES then Doxygen will immediately stop when
918944
# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
919945
# then Doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
@@ -994,10 +1020,10 @@ INPUT = @ZEPHYR_BASE@/doc/_doxygen/mainpage.md \
9941020
INPUT_ENCODING = UTF-8
9951021

9961022
# This tag can be used to specify the character encoding of the source files
997-
# that Doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
1023+
# that Doxygen parses. The INPUT_FILE_ENCODING tag can be used to specify
9981024
# character encoding on a per file pattern basis. Doxygen will compare the file
9991025
# name with each pattern and apply the encoding instead of the default
1000-
# INPUT_ENCODING) if there is a match. The character encodings are a list of the
1026+
# INPUT_ENCODING if there is a match. The character encodings are a list of the
10011027
# form: pattern=encoding (like *.php=ISO-8859-1).
10021028
# See also: INPUT_ENCODING for further information on supported encodings.
10031029

@@ -1016,9 +1042,9 @@ INPUT_FILE_ENCODING =
10161042
#
10171043
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cxxm,
10181044
# *.cpp, *.cppm, *.ccm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl,
1019-
# *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d,
1020-
# *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to
1021-
# be provided as Doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
1045+
# *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php,
1046+
# *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be
1047+
# provided as Doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
10221048
# *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
10231049

10241050
FILE_PATTERNS = *.c \
@@ -1569,9 +1595,9 @@ DOCSET_PUBLISHER_NAME = Publisher
15691595
# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
15701596
# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
15711597
# on Windows. In the beginning of 2021 Microsoft took the original page, with
1572-
# a.o. the download links, offline the HTML help workshop was already many years
1573-
# in maintenance mode). You can download the HTML help workshop from the web
1574-
# archives at Installation executable (see:
1598+
# a.o. the download links, offline (the HTML help workshop was already many
1599+
# years in maintenance mode). You can download the HTML help workshop from the
1600+
# web archives at Installation executable (see:
15751601
# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
15761602
# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
15771603
#
@@ -1745,20 +1771,29 @@ DISABLE_INDEX = NO
17451771
# further fine tune the look of the index (see "Fine-tuning the output"). As an
17461772
# example, the default style sheet generated by Doxygen has an example that
17471773
# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
1748-
# Since the tree basically has the same information as the tab index, you could
1749-
# consider setting DISABLE_INDEX to YES when enabling this option.
1750-
# The default value is: NO.
1774+
# Since the tree basically has more details information than the tab index, you
1775+
# could consider setting DISABLE_INDEX to YES when enabling this option.
1776+
# The default value is: YES.
17511777
# This tag requires that the tag GENERATE_HTML is set to YES.
17521778

17531779
GENERATE_TREEVIEW = YES
17541780

1755-
# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
1756-
# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
1757-
# area (value NO) or if it should extend to the full height of the window (value
1758-
# YES). Setting this to YES gives a layout similar to
1759-
# https://docs.readthedocs.io with more room for contents, but less room for the
1760-
# project logo, title, and description. If either GENERATE_TREEVIEW or
1761-
# DISABLE_INDEX is set to NO, this option has no effect.
1781+
# When GENERATE_TREEVIEW is set to YES, the PAGE_OUTLINE_PANEL option determines
1782+
# if an additional navigation panel is shown at the right hand side of the
1783+
# screen, displaying an outline of the contents of the main page, similar to
1784+
# e.g. https://developer.android.com/reference If GENERATE_TREEVIEW is set to
1785+
# NO, this option has no effect.
1786+
# The default value is: YES.
1787+
# This tag requires that the tag GENERATE_HTML is set to YES.
1788+
1789+
PAGE_OUTLINE_PANEL = YES
1790+
1791+
# When GENERATE_TREEVIEW is set to YES, the FULL_SIDEBAR option determines if
1792+
# the side bar is limited to only the treeview area (value NO) or if it should
1793+
# extend to the full height of the window (value YES). Setting this to YES gives
1794+
# a layout similar to e.g. https://docs.readthedocs.io with more room for
1795+
# contents, but less room for the project logo, title, and description. If
1796+
# GENERATE_TREEVIEW is set to NO, this option has no effect.
17621797
# The default value is: NO.
17631798
# This tag requires that the tag GENERATE_HTML is set to YES.
17641799

@@ -1878,7 +1913,7 @@ MATHJAX_FORMAT = HTML-CSS
18781913
# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
18791914
# This tag requires that the tag USE_MATHJAX is set to YES.
18801915

1881-
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
1916+
MATHJAX_RELPATH = https://cdn.jsdelivr.net/npm/mathjax@3
18821917

18831918
# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
18841919
# extension names that should be enabled during MathJax rendering. For example
@@ -2159,10 +2194,10 @@ LATEX_HIDE_INDICES = NO
21592194
# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
21602195
# bibliography, e.g. plainnat, or ieeetr. See
21612196
# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
2162-
# The default value is: plain.
2197+
# The default value is: plainnat.
21632198
# This tag requires that the tag GENERATE_LATEX is set to YES.
21642199

2165-
LATEX_BIB_STYLE = plain
2200+
LATEX_BIB_STYLE = plainnat
21662201

21672202
# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
21682203
# path from which the emoji images will be read. If a relative path is entered,
@@ -2721,6 +2756,15 @@ UML_LOOK = NO
27212756

27222757
UML_LIMIT_NUM_FIELDS = 10
27232758

2759+
# If the UML_LOOK tag is enabled, field labels are shown along the edge between
2760+
# two class nodes. If there are many fields and many nodes the graph may become
2761+
# too cluttered. The UML_MAX_EDGE_LABELS threshold limits the number of items to
2762+
# make the size more manageable. Set this to 0 for no limit.
2763+
# Minimum value: 0, maximum value: 100, default value: 10.
2764+
# This tag requires that the tag UML_LOOK is set to YES.
2765+
2766+
UML_MAX_EDGE_LABELS = 10
2767+
27242768
# If the DOT_UML_DETAILS tag is set to NO, Doxygen will show attributes and
27252769
# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
27262770
# tag is set to YES, Doxygen will add type and arguments for attributes and
@@ -2828,24 +2872,29 @@ DIR_GRAPH_MAX_DEPTH = 1
28282872
# generated by dot. For an explanation of the image formats see the section
28292873
# output formats in the documentation of the dot tool (Graphviz (see:
28302874
# https://www.graphviz.org/)).
2831-
# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
2832-
# to make the SVG files visible in IE 9+ (other browsers do not have this
2833-
# requirement).
2875+
#
2876+
# Note the formats svg:cairo and svg:cairo:cairo cannot be used in combination
2877+
# with INTERACTIVE_SVG (the INTERACTIVE_SVG will be set to NO).
28342878
# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
2835-
# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
2836-
# png:gdiplus:gdiplus.
2879+
# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus,
2880+
# png:gdiplus:gdiplus, svg:cairo, svg:cairo:cairo, svg:svg, svg:svg:core,
2881+
# gif:cairo, gif:cairo:gd, gif:cairo:gdiplus, gif:gdiplus, gif:gdiplus:gdiplus,
2882+
# gif:gd, gif:gd:gd, jpg:cairo, jpg:cairo:gd, jpg:cairo:gdiplus, jpg:gd,
2883+
# jpg:gd:gd, jpg:gdiplus and jpg:gdiplus:gdiplus.
28372884
# The default value is: png.
28382885
# This tag requires that the tag HAVE_DOT is set to YES.
28392886

28402887
DOT_IMAGE_FORMAT = png
28412888

2842-
# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
2843-
# enable generation of interactive SVG images that allow zooming and panning.
2889+
# If DOT_IMAGE_FORMAT is set to svg or svg:svg or svg:svg:core, then this option
2890+
# can be set to YES to enable generation of interactive SVG images that allow
2891+
# zooming and panning.
28442892
#
28452893
# Note that this requires a modern browser other than Internet Explorer. Tested
28462894
# and working are Firefox, Chrome, Safari, and Opera.
2847-
# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
2848-
# the SVG files visible. Older versions of IE do not have SVG support.
2895+
#
2896+
# Note This option will be automatically disabled when DOT_IMAGE_FORMAT is set
2897+
# to svg:cairo or svg:cairo:cairo.
28492898
# The default value is: NO.
28502899
# This tag requires that the tag HAVE_DOT is set to YES.
28512900

@@ -2895,6 +2944,12 @@ PLANTUML_CFG_FILE =
28952944

28962945
PLANTUML_INCLUDE_PATH =
28972946

2947+
# The PLANTUMLFILE_DIRS tag can be used to specify one or more directories that
2948+
# contain PlantUml files that are included in the documentation (see the
2949+
# \plantumlfile command).
2950+
2951+
PLANTUMLFILE_DIRS =
2952+
28982953
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
28992954
# that will be shown in the graph. If the number of nodes in a graph becomes
29002955
# larger than this value, Doxygen will truncate the graph, which is visualized

0 commit comments

Comments
 (0)