From 108203d1fdd63b5d05ebe4838a7e1554abd8344f Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sat, 27 Jun 2020 09:29:19 -0400 Subject: [PATCH 1/2] Make tracetools' Doxyfile a standalone config Signed-off-by: Christophe Bedard --- tracetools/Doxyfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tracetools/Doxyfile b/tracetools/Doxyfile index 8ba3973..78d0049 100644 --- a/tracetools/Doxyfile +++ b/tracetools/Doxyfile @@ -1,8 +1,7 @@ # All settings not listed here will use the Doxygen default values. -# To use, see: https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing-api PROJECT_NAME = "tracetools" -PROJECT_NUMBER = $(PROJECT_NUMBER) +PROJECT_NUMBER = master PROJECT_BRIEF = "Tracing tools and instrumentation for ROS 2" INPUT = ./include @@ -27,6 +26,7 @@ EXCLUDE_SYMBOLS = \ "_get_symbol_funcptr" # Tag files that do not exist will produce a warning and cross-project linking will not work. -TAGFILES += "../../../data/cppreference-doxygen-web.tag.xml=http://en.cppreference.com/w/" +TAGFILES += "../../../../../doxygen_tag_files/cppreference-doxygen-web.tag.xml=http://en.cppreference.com/w/" # Uncomment to generate tag files for cross-project linking. -GENERATE_TAGFILE = "../../../data/tracetools.tag" +# (path relative to workspace dir: doxygen_tag_files/$PACKAGE_NAME.tag) +#GENERATE_TAGFILE = "../../../../../doxygen_tag_files/tracetools.tag" From 1ba6de1fa4f8fd288476176313bf5cf6bef16982 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sat, 27 Jun 2020 10:23:23 -0400 Subject: [PATCH 2/2] Make tracetools_test's conf.py file a standalone config Signed-off-by: Christophe Bedard --- tracetools_test/docs/source/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tracetools_test/docs/source/conf.py b/tracetools_test/docs/source/conf.py index e99e1ee..da1e840 100644 --- a/tracetools_test/docs/source/conf.py +++ b/tracetools_test/docs/source/conf.py @@ -45,9 +45,9 @@ copyright = '2019, Robert Bosch GmbH' # noqa author = 'Robert Bosch GmbH' # The short X.Y version -version = os.environ.get('SPHINX_VERSION_SHORT', '') +version = '' # The full version, including alpha/beta/rc tags -release = os.environ.get('SPHINX_VERSION_FULL', '') +release = '1.0.1' # -- General configuration ---------------------------------------------------