diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-06-29 14:48:17 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-06-29 14:48:17 +0200 |
| commit | f76461f7b87435d47cbbe3d293abce5ce540d530 (patch) | |
| tree | 9307c2b700cb25cfd12d7809e6655a53c2469aeb | |
| parent | 40c61c91bdb9035484ad98de7abdacda714c1937 (diff) | |
| download | sigc++-f76461f7b87435d47cbbe3d293abce5ce540d530.tar.gz | |
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 | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in index c94b485..2c407c9 100644 --- a/docs/reference/Doxyfile.in +++ b/docs/reference/Doxyfile.in @@ -300,12 +300,10 @@ GENERATE_TAGFILE = "reference/libsigc++-@SIGCXX_API_VERSION@.tag" ALLEXTERNALS = NO EXTERNAL_GROUPS = NO EXTERNAL_PAGES = YES -PERL_PATH = @PERL@ #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES -MSCGEN_PATH = DIA_PATH = HIDE_UNDOC_RELATIONS = NO HAVE_DOT = YES diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 1803768..4eb402d 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -1,7 +1,7 @@ # docs/reference # Input: built_files_root, project_source_root, sigcxx_pcname, -# sigcxx_api_version, perl, build_documentation, source_h_files, +# sigcxx_api_version, build_documentation, source_h_files, # built_h_files, install_datadir, python3, doc_reference, # built_h_file_targets # Output: install_docdir, install_devhelpdir @@ -23,10 +23,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 @@ -43,7 +46,6 @@ doc_conf_data.set('abs_top_builddir', built_files_root) doc_conf_data.set('abs_top_srcdir', project_source_root) doc_conf_data.set('SIGCXX_API_VERSION', sigcxx_api_version) doc_conf_data.set('DOXYGEN_TAGFILES', doxygen_tagfiles) -doc_conf_data.set('PERL', perl.found() ? perl.path() : '') configure_file( input: 'Doxyfile.in', |