Skip to content

Commit

Permalink
Merge pull request #325 from tetengo/doxygen_upgrade
Browse files Browse the repository at this point in the history
Doxygen upgrade
  • Loading branch information
kaorut committed Jun 9, 2024
2 parents 9c79d36 + 8a12a2b commit 7bb44ac
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
CONCURRENT_BUILD: 4
CLANG_COMMAND: clang-14
CLANGXX_COMMAND: clang++-14
DOXYGEN_VER: 1.10.0
DOXYGEN_VER: 1.11.0
DOXYGEN_CACHE_REV: 0
BOOST_VER: 1_84_0
BOOST_VER_DOT: 1.84.0
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
mv .build/tetengo-* .artifacts
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts-linux
path: .artifacts
2 changes: 1 addition & 1 deletion .github/workflows/windows-visualcpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ jobs:
move bin.libimage\tetengo-windows-libimage-x64-${{ env.TETENGO_VER }}.zip artifacts
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts-windows
path: artifacts
40 changes: 24 additions & 16 deletions Doxyfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Doxyfile 1.10.0
# Doxyfile 1.11.0

# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
Expand Down Expand Up @@ -354,7 +354,7 @@ MARKDOWN_SUPPORT = YES
# to that level are automatically included in the table of contents, even if
# they do not have an id attribute.
# Note: This feature currently applies only to Markdown headings.
# Minimum value: 0, maximum value: 99, default value: 5.
# Minimum value: 0, maximum value: 99, default value: 6.
# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.

TOC_INCLUDE_HEADINGS = 5
Expand Down Expand Up @@ -382,8 +382,8 @@ AUTOLINK_SUPPORT = YES
# to include (a tag file for) the STL sources as input, then you should set this
# tag to YES in order to let doxygen match functions declarations and
# definitions whose arguments contain STL classes (e.g. func(std::string);
# versus func(std::string) {}). This also make the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
# versus func(std::string) {}). This also makes the inheritance and
# collaboration diagrams that involve STL classes more complete and accurate.
# The default value is: NO.

BUILTIN_STL_SUPPORT = NO
Expand All @@ -395,9 +395,9 @@ BUILTIN_STL_SUPPORT = NO
CPP_CLI_SUPPORT = NO

# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
# will parse them like normal C++ but will assume all classes use public instead
# of private inheritance when no explicit protection keyword is present.
# https://www.riverbankcomputing.com/software) sources only. Doxygen will parse
# them like normal C++ but will assume all classes use public instead of private
# inheritance when no explicit protection keyword is present.
# The default value is: NO.

SIP_SUPPORT = NO
Expand Down Expand Up @@ -968,8 +968,8 @@ INPUT_ENCODING = UTF-8
# character encoding on a per file pattern basis. Doxygen will compare the file
# name with each pattern and apply the encoding instead of the default
# INPUT_ENCODING) if there is a match. The character encodings are a list of the
# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
# "INPUT_ENCODING" for further information on supported encodings.
# form: pattern=encoding (like *.php=ISO-8859-1).
# See also: INPUT_ENCODING for further information on supported encodings.

INPUT_FILE_ENCODING =

Expand Down Expand Up @@ -1375,11 +1375,11 @@ HTML_EXTRA_FILES =

# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
# should be rendered with a dark or light theme.
# Possible values are: LIGHT always generate light mode output, DARK always
# generate dark mode output, AUTO_LIGHT automatically set the mode according to
# the user preference, use light mode if no preference is set (the default),
# AUTO_DARK automatically set the mode according to the user preference, use
# dark mode if no preference is set and TOGGLE allow to user to switch between
# Possible values are: LIGHT always generates light mode output, DARK always
# generates dark mode output, AUTO_LIGHT automatically sets the mode according
# to the user preference, uses light mode if no preference is set (the default),
# AUTO_DARK automatically sets the mode according to the user preference, uses
# dark mode if no preference is set and TOGGLE allows a user to switch between
# light and dark mode via a button.
# The default value is: AUTO_LIGHT.
# This tag requires that the tag GENERATE_HTML is set to YES.
Expand Down Expand Up @@ -1814,7 +1814,7 @@ MATHJAX_VERSION = MathJax_2
# Possible values are: HTML-CSS (which is slower, but has the best
# compatibility. This is the name for Mathjax version 2, for MathJax version 3
# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
# for MathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
# is the name for Mathjax version 3, for MathJax version 2 this will be
# translated into HTML-CSS) and SVG.
# The default value is: HTML-CSS.
Expand Down Expand Up @@ -2184,6 +2184,14 @@ RTF_STYLESHEET_FILE =

RTF_EXTENSIONS_FILE =

# The RTF_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the RTF_OUTPUT output directory.
# Note that the files will be copied as-is; there are no commands or markers
# available.
# This tag requires that the tag GENERATE_RTF is set to YES.

RTF_EXTRA_FILES =

#---------------------------------------------------------------------------
# Configuration options related to the man page output
#---------------------------------------------------------------------------
Expand Down Expand Up @@ -2784,7 +2792,7 @@ PLANTUML_INCLUDE_PATH =
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
# that will be shown in the graph. If the number of nodes in a graph becomes
# larger than this value, doxygen will truncate the graph, which is visualized
# by representing a node as a red box. Note that doxygen if the number of direct
# by representing a node as a red box. Note that if the number of direct
# children of the root node in a graph is already larger than
# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ How to Build and Install

- [Visual Studio 2022](https://visualstudio.microsoft.com/)
- [Boost C++ libraries 1.84.0](https://www.boost.org/)
- [Doxygen 1.10.0](https://www.doxygen.nl/)
- [Doxygen 1.11.0](https://www.doxygen.nl/)
- [Graphviz](https://www.graphviz.org/)
- [WiX toolset 4.0.2](https://wixtoolset.org/)
- [Python 3.9](https://www.python.org/) or
Expand Down Expand Up @@ -143,7 +143,7 @@ Doxygen will output the documents into the directory `doc`.
[GCC 10](https://gcc.gnu.org/) or
[GCC 12](https://gcc.gnu.org/)
- [Boost C++ libraries 1.84.0](https://www.boost.org/)
- [Doxygen 1.10.0](https://www.doxygen.nl/)
- [Doxygen 1.11.0](https://www.doxygen.nl/)
- [Graphviz](https://www.graphviz.org/)
- [include-what-you-use 0.15](https://include-what-you-use.org/) or
[include-what-you-use 0.17](https://include-what-you-use.org/)
Expand Down
1 change: 1 addition & 0 deletions library/lattice/c/src/tetengo_lattice_nBestIterator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Copyright (C) 2019-2024 kaoru https://www.tetengo.org/
*/

#include <algorithm>
#include <any>
#include <iterator>
#include <memory>
Expand Down
1 change: 1 addition & 0 deletions library/lattice/c/src/tetengo_lattice_vocabulary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Copyright (C) 2019-2024 kaoru https://www.tetengo.org/
*/

#include <algorithm>
#include <any>
#include <cassert>
#include <cstddef>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Copyright (C) 2019-2024 kaoru https://www.tetengo.org/
*/

#include <algorithm>
#include <iterator>
#include <memory>
#include <numeric>
Expand Down
1 change: 1 addition & 0 deletions library/lattice/test/src/test_tetengo.lattice.lattice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Copyright (C) 2019-2024 kaoru https://www.tetengo.org/
*/

#include <algorithm>
#include <any>
#include <cassert>
#include <cstddef>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Copyright (C) 2019-2024 kaoru https://www.tetengo.org/
*/

#include <algorithm>
#include <any>
#include <cassert>
#include <cstddef>
Expand Down

0 comments on commit 7bb44ac

Please sign in to comment.