Skip to content

Commit 24227aa

Browse files
committed
build: move to doxygen 1.15.0 by default
1 parent b910056 commit 24227aa

File tree

9 files changed

+78
-38
lines changed

9 files changed

+78
-38
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [main]
88

99
env:
10-
DEFAULT_DOXYGEN_VERSION: "1.14.0"
10+
DEFAULT_DOXYGEN_VERSION: "1.15.0"
1111

1212
jobs:
1313
tests:

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [2.6.0]
9+
10+
### Changed
11+
12+
- Default doxygen version is now `1.15.0`
13+
814
## [2.5.1]
915

1016
### Changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ doxygen_extension = use_extension("@rules_doxygen//:extensions.bzl", "doxygen_ex
4444
use_repo(doxygen_extension, "doxygen")
4545
```
4646

47-
The extension will create a default configuration for all platforms with the version `1.14.0` of Doxygen.
47+
The extension will create a default configuration for all platforms with the version `1.15.0` of Doxygen.
4848
You can override this value with a custom one for each supported platform, i.e. _windows_, _mac_, _mac-arm_, _linux_ and _linux-arm_.
4949

5050
```bzl

docs/doxygen_doc.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,15 @@ doxygen(<a href="#doxygen-name">name</a>, <a href="#doxygen-srcs">srcs</a>, <a h
3737
<a href="#doxygen-qt_autobrief">qt_autobrief</a>, <a href="#doxygen-multiline_cpp_is_brief">multiline_cpp_is_brief</a>, <a href="#doxygen-python_docstring">python_docstring</a>, <a href="#doxygen-inherit_docs">inherit_docs</a>, <a href="#doxygen-separate_member_pages">separate_member_pages</a>,
3838
<a href="#doxygen-tab_size">tab_size</a>, <a href="#doxygen-aliases">aliases</a>, <a href="#doxygen-optimize_output_for_c">optimize_output_for_c</a>, <a href="#doxygen-optimize_output_java">optimize_output_java</a>, <a href="#doxygen-optimize_for_fortran">optimize_for_fortran</a>,
3939
<a href="#doxygen-optimize_output_vhdl">optimize_output_vhdl</a>, <a href="#doxygen-optimize_output_slice">optimize_output_slice</a>, <a href="#doxygen-extension_mapping">extension_mapping</a>, <a href="#doxygen-markdown_support">markdown_support</a>,
40-
<a href="#doxygen-toc_include_headings">toc_include_headings</a>, <a href="#doxygen-markdown_id_style">markdown_id_style</a>, <a href="#doxygen-autolink_support">autolink_support</a>, <a href="#doxygen-autolink_ignore_words">autolink_ignore_words</a>,
41-
<a href="#doxygen-builtin_stl_support">builtin_stl_support</a>, <a href="#doxygen-cpp_cli_support">cpp_cli_support</a>, <a href="#doxygen-sip_support">sip_support</a>, <a href="#doxygen-idl_property_support">idl_property_support</a>, <a href="#doxygen-distribute_group_doc">distribute_group_doc</a>,
42-
<a href="#doxygen-group_nested_compounds">group_nested_compounds</a>, <a href="#doxygen-subgrouping">subgrouping</a>, <a href="#doxygen-inline_grouped_classes">inline_grouped_classes</a>, <a href="#doxygen-inline_simple_structs">inline_simple_structs</a>,
43-
<a href="#doxygen-typedef_hides_struct">typedef_hides_struct</a>, <a href="#doxygen-lookup_cache_size">lookup_cache_size</a>, <a href="#doxygen-num_proc_threads">num_proc_threads</a>, <a href="#doxygen-timestamp">timestamp</a>, <a href="#doxygen-extract_all">extract_all</a>,
44-
<a href="#doxygen-extract_private">extract_private</a>, <a href="#doxygen-extract_priv_virtual">extract_priv_virtual</a>, <a href="#doxygen-extract_package">extract_package</a>, <a href="#doxygen-extract_static">extract_static</a>, <a href="#doxygen-extract_local_classes">extract_local_classes</a>,
45-
<a href="#doxygen-extract_local_methods">extract_local_methods</a>, <a href="#doxygen-extract_anon_nspaces">extract_anon_nspaces</a>, <a href="#doxygen-resolve_unnamed_params">resolve_unnamed_params</a>, <a href="#doxygen-hide_undoc_members">hide_undoc_members</a>,
46-
<a href="#doxygen-hide_undoc_classes">hide_undoc_classes</a>, <a href="#doxygen-hide_undoc_namespaces">hide_undoc_namespaces</a>, <a href="#doxygen-hide_friend_compounds">hide_friend_compounds</a>, <a href="#doxygen-hide_in_body_docs">hide_in_body_docs</a>,
47-
<a href="#doxygen-internal_docs">internal_docs</a>, <a href="#doxygen-case_sense_names">case_sense_names</a>, <a href="#doxygen-hide_scope_names">hide_scope_names</a>, <a href="#doxygen-hide_compound_reference">hide_compound_reference</a>, <a href="#doxygen-show_headerfile">show_headerfile</a>,
40+
<a href="#doxygen-markdown_strict">markdown_strict</a>, <a href="#doxygen-toc_include_headings">toc_include_headings</a>, <a href="#doxygen-markdown_id_style">markdown_id_style</a>, <a href="#doxygen-autolink_support">autolink_support</a>,
41+
<a href="#doxygen-autolink_ignore_words">autolink_ignore_words</a>, <a href="#doxygen-builtin_stl_support">builtin_stl_support</a>, <a href="#doxygen-cpp_cli_support">cpp_cli_support</a>, <a href="#doxygen-sip_support">sip_support</a>,
42+
<a href="#doxygen-idl_property_support">idl_property_support</a>, <a href="#doxygen-distribute_group_doc">distribute_group_doc</a>, <a href="#doxygen-group_nested_compounds">group_nested_compounds</a>, <a href="#doxygen-subgrouping">subgrouping</a>,
43+
<a href="#doxygen-inline_grouped_classes">inline_grouped_classes</a>, <a href="#doxygen-inline_simple_structs">inline_simple_structs</a>, <a href="#doxygen-typedef_hides_struct">typedef_hides_struct</a>, <a href="#doxygen-lookup_cache_size">lookup_cache_size</a>,
44+
<a href="#doxygen-num_proc_threads">num_proc_threads</a>, <a href="#doxygen-timestamp">timestamp</a>, <a href="#doxygen-extract_all">extract_all</a>, <a href="#doxygen-extract_private">extract_private</a>, <a href="#doxygen-extract_priv_virtual">extract_priv_virtual</a>,
45+
<a href="#doxygen-extract_package">extract_package</a>, <a href="#doxygen-extract_static">extract_static</a>, <a href="#doxygen-extract_local_classes">extract_local_classes</a>, <a href="#doxygen-extract_local_methods">extract_local_methods</a>,
46+
<a href="#doxygen-extract_anon_nspaces">extract_anon_nspaces</a>, <a href="#doxygen-resolve_unnamed_params">resolve_unnamed_params</a>, <a href="#doxygen-hide_undoc_members">hide_undoc_members</a>, <a href="#doxygen-hide_undoc_classes">hide_undoc_classes</a>,
47+
<a href="#doxygen-hide_undoc_namespaces">hide_undoc_namespaces</a>, <a href="#doxygen-hide_friend_compounds">hide_friend_compounds</a>, <a href="#doxygen-hide_in_body_docs">hide_in_body_docs</a>, <a href="#doxygen-internal_docs">internal_docs</a>,
48+
<a href="#doxygen-case_sense_names">case_sense_names</a>, <a href="#doxygen-hide_scope_names">hide_scope_names</a>, <a href="#doxygen-hide_compound_reference">hide_compound_reference</a>, <a href="#doxygen-show_headerfile">show_headerfile</a>,
4849
<a href="#doxygen-show_include_files">show_include_files</a>, <a href="#doxygen-show_grouped_memb_inc">show_grouped_memb_inc</a>, <a href="#doxygen-force_local_includes">force_local_includes</a>, <a href="#doxygen-inline_info">inline_info</a>,
4950
<a href="#doxygen-sort_member_docs">sort_member_docs</a>, <a href="#doxygen-sort_brief_docs">sort_brief_docs</a>, <a href="#doxygen-sort_members_ctors_1st">sort_members_ctors_1st</a>, <a href="#doxygen-sort_group_names">sort_group_names</a>,
5051
<a href="#doxygen-sort_by_scope_name">sort_by_scope_name</a>, <a href="#doxygen-strict_proto_matching">strict_proto_matching</a>, <a href="#doxygen-generate_todolist">generate_todolist</a>, <a href="#doxygen-generate_testlist">generate_testlist</a>,
@@ -310,6 +311,7 @@ doxygen(
310311
| <a id="doxygen-optimize_output_slice"></a>optimize_output_slice | Set the `optimize_output_slice` tag to `True` if your project consists of Slice sources only. | `None` |
311312
| <a id="doxygen-extension_mapping"></a>extension_mapping | Doxygen selects the parser to use depending on the extension of the files it parses. | `None` |
312313
| <a id="doxygen-markdown_support"></a>markdown_support | If the `markdown_support` tag is enabled then Doxygen pre-processes all comments according to the Markdown format, which allows for more readable documentation. | `None` |
314+
| <a id="doxygen-markdown_strict"></a>markdown_strict | If the markdown_strict tag is enabled then Doxygen treats text in comments as Markdown formatted also in cases where Doxygen's native markup format conflicts with that of Markdown. | `None` |
313315
| <a id="doxygen-toc_include_headings"></a>toc_include_headings | When the `toc_include_headings` tag is set to a non-zero value, all headings up to that level are automatically included in the table of contents, even if they do not have an id attribute. | `None` |
314316
| <a id="doxygen-markdown_id_style"></a>markdown_id_style | The `markdown_id_style` tag can be used to specify the algorithm used to generate identifiers for the Markdown headings. | `None` |
315317
| <a id="doxygen-autolink_support"></a>autolink_support | When enabled Doxygen tries to link words that correspond to documented classes, or namespaces to their corresponding documentation. | `None` |

docs/extensions_doc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ The resulting repository will have the following targets:
128128
- `@doxygen//:doxygen.bzl`, containing the doxygen macro used to generate the documentation.
129129
- `@doxygen//:Doxyfile.template`, default Doxyfile template used to generate the Doxyfile.
130130

131-
The extension will create a default configuration for all platforms with the version `1.14.0` of Doxygen.
131+
The extension will create a default configuration for all platforms with the version `1.15.0` of Doxygen.
132132
You can override this value with a custom one for each supported platform, i.e. _windows_, _mac_, _mac-arm_, _linux_ and _linux-arm_.
133133

134134
```bzl

doxygen/Doxyfile.template

Lines changed: 49 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Doxyfile 1.14.0
1+
# Doxyfile 1.15.0
22

33
# This file describes the settings to be used by the documentation system
44
# Doxygen (www.doxygen.org) for a project.
@@ -361,6 +361,20 @@ EXTENSION_MAPPING =
361361

362362
MARKDOWN_SUPPORT = YES
363363

364+
# If the MARKDOWN_STRICT tag is enabled then Doxygen treats text in comments as
365+
# Markdown formatted also in cases where Doxygen's native markup format
366+
# conflicts with that of Markdown. This is only relevant in cases where
367+
# backticks are used. Doxygen's native markup style allows a single quote to end
368+
# a text fragment started with a backtick and then treat it as a piece of quoted
369+
# text, whereas in Markdown such text fragment is treated as verbatim and only
370+
# ends when a second matching backtick is found. Also, Doxygen's native markup
371+
# format requires double quotes to be escaped when they appear in a backtick
372+
# section, whereas this is not needed for Markdown.
373+
# The default value is: YES.
374+
# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
375+
376+
MARKDOWN_STRICT = YES
377+
364378
# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
365379
# to that level are automatically included in the table of contents, even if
366380
# they do not have an id attribute.
@@ -510,7 +524,7 @@ LOOKUP_CACHE_SIZE = 0
510524
# which effectively disables parallel processing. Please report any issues you
511525
# encounter. Generating dot graphs in parallel is controlled by the
512526
# DOT_NUM_THREADS setting.
513-
# Minimum value: 0, maximum value: 32, default value: 1.
527+
# Minimum value: 0, maximum value: 512, default value: 1.
514528

515529
NUM_PROC_THREADS = 1
516530

@@ -1908,7 +1922,7 @@ USE_MATHJAX = NO
19081922
# regards to the different settings, so it is possible that also other MathJax
19091923
# settings have to be changed when switching between the different MathJax
19101924
# versions.
1911-
# Possible values are: MathJax_2 and MathJax_3.
1925+
# Possible values are: MathJax_2, MathJax_3 and MathJax_4.
19121926
# The default value is: MathJax_2.
19131927
# This tag requires that the tag USE_MATHJAX is set to YES.
19141928

@@ -1917,9 +1931,10 @@ MATHJAX_VERSION = MathJax_2
19171931
# When MathJax is enabled you can set the default output format to be used for
19181932
# the MathJax output. For more details about the output format see MathJax
19191933
# version 2 (see:
1920-
# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
1934+
# https://docs.mathjax.org/en/v2.7/output.html), MathJax version 3 (see:
1935+
# https://docs.mathjax.org/en/v3.2/output/index.html) and MathJax version 4
19211936
# (see:
1922-
# http://docs.mathjax.org/en/latest/web/components/output.html).
1937+
# https://docs.mathjax.org/en/v4.0/output/index.htm).
19231938
# Possible values are: HTML-CSS (which is slower, but has the best
19241939
# compatibility. This is the name for Mathjax version 2, for MathJax version 3
19251940
# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
@@ -1932,36 +1947,50 @@ MATHJAX_VERSION = MathJax_2
19321947
MATHJAX_FORMAT = HTML-CSS
19331948

19341949
# When MathJax is enabled you need to specify the location relative to the HTML
1935-
# output directory using the MATHJAX_RELPATH option. The destination directory
1936-
# should contain the MathJax.js script. For instance, if the mathjax directory
1937-
# is located at the same level as the HTML output directory, then
1938-
# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
1939-
# Content Delivery Network so you can quickly see the result without installing
1940-
# MathJax. However, it is strongly recommended to install a local copy of
1941-
# MathJax from https://www.mathjax.org before deployment. The default value is:
1950+
# output directory using the MATHJAX_RELPATH option. For Mathjax version 2 the
1951+
# destination directory should contain the MathJax.js script. For instance, if
1952+
# the mathjax directory is located at the same level as the HTML output
1953+
# directory, then MATHJAX_RELPATH should be ../mathjax.s For Mathjax versions 3
1954+
# and 4 the destination directory should contain the tex-<format>.js script
1955+
# (where <format> is either chtml or svg). The default value points to the
1956+
# MathJax Content Delivery Network so you can quickly see the result without
1957+
# installing MathJax. However, it is strongly recommended to install a local
1958+
# copy of MathJax from https://www.mathjax.org before deployment. The default
1959+
# value is:
19421960
# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
19431961
# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
1962+
# - in case of MathJax version 4: https://cdn.jsdelivr.net/npm/mathjax@4
19441963
# This tag requires that the tag USE_MATHJAX is set to YES.
19451964

19461965
MATHJAX_RELPATH =
19471966

19481967
# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
19491968
# extension names that should be enabled during MathJax rendering. For example
1950-
# for MathJax version 2 (see
1951-
# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
1969+
# for MathJax version 2 (see https://docs.mathjax.org/en/v2.7/tex.html):
19521970
# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
19531971
# For example for MathJax version 3 (see
1954-
# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
1972+
# https://docs.mathjax.org/en/v3.2/input/tex/extensions/):
19551973
# MATHJAX_EXTENSIONS = ams
1974+
# For example for MathJax version 4 (see
1975+
# https://docs.mathjax.org/en/v4.0/input/tex/extensions/):
1976+
# MATHJAX_EXTENSIONS = units
1977+
# Note that for Mathjax version 4 quite a few extensions are already
1978+
# automatically loaded. To disable a package in Mathjax version 4 one can use
1979+
# the package name prepended with a minus sign (- like MATHJAX_EXTENSIONS +=
1980+
# -textmacros)
19561981
# This tag requires that the tag USE_MATHJAX is set to YES.
19571982

19581983
MATHJAX_EXTENSIONS =
19591984

19601985
# The MATHJAX_CODEFILE tag can be used to specify a file with JavaScript pieces
1961-
# of code that will be used on startup of the MathJax code. See the MathJax site
1962-
# (see:
1963-
# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
1964-
# example see the documentation.
1986+
# of code that will be used on startup of the MathJax code. See the Mathjax site
1987+
# for more details:
1988+
# - MathJax version 2 (see:
1989+
# https://docs.mathjax.org/en/v2.7/)
1990+
# - MathJax version 3 (see:
1991+
# https://docs.mathjax.org/en/v3.2/)
1992+
# - MathJax version 4 (see:
1993+
# https://docs.mathjax.org/en/v4.0/) For an example see the documentation.
19651994
# This tag requires that the tag USE_MATHJAX is set to YES.
19661995

19671996
MATHJAX_CODEFILE =
@@ -2622,7 +2651,7 @@ HAVE_DOT = NO
26222651
# processors available in the system. You can set it explicitly to a value
26232652
# larger than 0 to get control over the balance between CPU load and processing
26242653
# speed.
2625-
# Minimum value: 0, maximum value: 32, default value: 0.
2654+
# Minimum value: 0, maximum value: 512, default value: 0.
26262655
# This tag requires that the tag HAVE_DOT is set to YES.
26272656

26282657
DOT_NUM_THREADS = 0

doxygen/doxygen.bzl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ def doxygen(
249249
optimize_output_slice = None,
250250
extension_mapping = None,
251251
markdown_support = None,
252+
markdown_strict = None,
252253
toc_include_headings = None,
253254
markdown_id_style = None,
254255
autolink_support = None,
@@ -746,6 +747,7 @@ def doxygen(
746747
optimize_output_slice: Set the `optimize_output_slice` tag to `True` if your project consists of Slice sources only.
747748
extension_mapping: Doxygen selects the parser to use depending on the extension of the files it parses.
748749
markdown_support: If the `markdown_support` tag is enabled then Doxygen pre-processes all comments according to the Markdown format, which allows for more readable documentation.
750+
markdown_strict: If the markdown_strict tag is enabled then Doxygen treats text in comments as Markdown formatted also in cases where Doxygen's native markup format conflicts with that of Markdown.
749751
toc_include_headings: When the `toc_include_headings` tag is set to a non-zero value, all headings up to that level are automatically included in the table of contents, even if they do not have an id attribute.
750752
markdown_id_style: The `markdown_id_style` tag can be used to specify the algorithm used to generate identifiers for the Markdown headings.
751753
autolink_support: When enabled Doxygen tries to link words that correspond to documented classes, or namespaces to their corresponding documentation.
@@ -1058,6 +1060,7 @@ def doxygen(
10581060
_add_generic_configuration(configurations, "OPTIMIZE_OUTPUT_SLICE", optimize_output_slice)
10591061
_add_generic_configuration(configurations, "EXTENSION_MAPPING", extension_mapping)
10601062
_add_generic_configuration(configurations, "MARKDOWN_SUPPORT", markdown_support)
1063+
_add_generic_configuration(configurations, "MARKDOWN_STRICT", markdown_strict)
10611064
_add_generic_configuration(configurations, "TOC_INCLUDE_HEADINGS", toc_include_headings)
10621065
_add_generic_configuration(configurations, "MARKDOWN_ID_STYLE", markdown_id_style)
10631066
_add_generic_configuration(configurations, "AUTOLINK_SUPPORT", autolink_support)

examples/executable/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ int main(int argc, char* argv[]) {
3131
" <p>Output directory: "
3232
<< out_path
3333
<< "</p>\n"
34-
" <p>Generated by a custom executable mimicking Doxygen 1.14.0.</p>\n"
34+
" <p>Generated by a custom executable mimicking Doxygen 1.15.0.</p>\n"
3535
"</body>\n"
3636
"</html>\n";
3737
file.close();

0 commit comments

Comments
 (0)