diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-06-29 15:41:17 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-06-29 15:41:17 +0200 |
| commit | 9dfda25061547d5d09d56e5134bd843a6bd0c178 (patch) | |
| tree | 74ef855cc0a687002a559b0edadf963ba313221e | |
| parent | d9c7929383eec6d881998304dd8ad47d094141a0 (diff) | |
docs/reference/: Update for Doxygen >= 1.8.16
* docs/reference/meson.build: Doxygen 1.8.16 and later does not store
tag file names in the html files. This requires changes in meson.build
and in doc-install.pl (in mm-common). Otherwise references to other modules
won't be updated in the html files when they are installed.
* docs/reference/Doxyfile.in: Remove PERL_PATH and MSCGEN_PATH.
Doxygen since version 1.8.0 does not use them.
| -rw-r--r-- | docs/reference/Doxyfile.in | 2 | ||||
| -rw-r--r-- | docs/reference/meson.build | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in index ce05665..f35f5a0 100644 --- a/docs/reference/Doxyfile.in +++ b/docs/reference/Doxyfile.in @@ -304,12 +304,10 @@ GENERATE_TAGFILE = "reference/@CAIROMM_MODULE_NAME@.tag" ALLEXTERNALS = NO EXTERNAL_GROUPS = NO EXTERNAL_PAGES = YES -PERL_PATH = @PERL@ #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = NO -MSCGEN_PATH = DIA_PATH = HIDE_UNDOC_RELATIONS = NO HAVE_DOT = YES diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 1e8cb07..ba8a41a 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -1,8 +1,8 @@ # docs/reference # Input: project_build_root, project_source_root, cairomm_pcname, -# perl, build_documentation, source_h_files, -# install_datadir, python3, doc_reference_py +# build_documentation, source_h_files, install_datadir, python3, +# doc_reference_py # Output: install_docdir, install_devhelpdir, book_name # There are no built source files in cairomm. @@ -25,10 +25,13 @@ foreach module : tag_file_modules htmlrefdir = htmlrefpub endif doxygen_tagfiles += ' "' + doxytagfile + '=' + htmlrefpub + '"' - if not htmlrefdir.endswith('/') - htmlrefdir += '/' - endif + + # Doxygen <= 1.8.15 docinstall_flags += ['-l', doxytagfile.split('/')[-1] + '@' + htmlrefdir] + if htmlrefpub != htmlrefdir + # Doxygen >= 1.8.16 + docinstall_flags += ['-l', 's@' + htmlrefpub + '@' + htmlrefdir] + endif endif endforeach @@ -45,7 +48,6 @@ doc_conf_data.set('abs_top_builddir', project_build_root) doc_conf_data.set('abs_top_srcdir', project_source_root) doc_conf_data.set('CAIROMM_MODULE_NAME', book_name) doc_conf_data.set('DOXYGEN_TAGFILES', doxygen_tagfiles) -doc_conf_data.set('PERL', perl.found() ? perl.path() : '') configure_file( input: 'Doxyfile.in', |