From 57be10c29a234ebdf5704e150205c5275c9fb445 Mon Sep 17 00:00:00 2001
From: Jean-Matthieu Etancelin <jean-matthieu.etancelin@univ-pau.fr>
Date: Sun, 27 Oct 2024 15:08:17 +0100
Subject: [PATCH] Try fixing html pages generation
---
docs/config/gen_content.sh.in | 1 +
docs/meson.build | 11 +++++------
meson.build | 1 +
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/docs/config/gen_content.sh.in b/docs/config/gen_content.sh.in
index ffc160e45..9a6788349 100755
--- a/docs/config/gen_content.sh.in
+++ b/docs/config/gen_content.sh.in
@@ -24,6 +24,7 @@ done
cat @SPHINX_INPUT_HYSOPDOC@/license.rst @HYSOP_SOURCE_DIR@/LICENSE > @SPHINX_TMP@/license.rst
## Doxygen
mkdir -p @DOXYGEN_OUTPUT@
+@DOXYGEN_BIN@ -u @DOXYGEN_CONFIG@
@DOXYGEN_BIN@ @DOXYGEN_CONFIG@ > @DOC_LOGS_DIR@/doxygen.log
## API
rm -rf @SPHINX_TMP@/apidoc
diff --git a/docs/meson.build b/docs/meson.build
index 7f701bbaf..a7b2f00d9 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -18,22 +18,21 @@ endif
subdir('config')
-docs_gen_html_content = custom_target('docs',
- output: 'docs',
+docs_gen_html_content = custom_target('docs_html',
+ output: 'docs_html.done',
capture: false,
command: [bash, doc_build_dir + '/config/gen_content.sh', 'html'],
env: docs_env)
-docs_gen_latex_content = custom_target('docs_gen_latex_content',
- output: 'docs_gen_latex_content.done',
+docs_gen_latex_content = custom_target('docs_latex',
+ output: 'docs_latex.done',
capture: false,
command: [bash, doc_build_dir + '/config/gen_content.sh', 'latex'],
depends: docs_gen_html_content,
env: docs_env)
-docs_env.set('HYSOP_VERBOSE', 'false')
-docs_doctest = custom_target('doctest',
+docs_doctest = custom_target('docs_doctest',
output: 'docs_doctest.done',
capture: false,
env: docs_env,
diff --git a/meson.build b/meson.build
index 491753c80..22c23850b 100644
--- a/meson.build
+++ b/meson.build
@@ -178,6 +178,7 @@ subdir('src')
if with_documentation == 'ON'
docs_env = environment()
docs_env.set('PYTHONPATH', py.get_install_dir())
+ docs_env.set('HYSOP_VERBOSE', 'False')
doxygen = find_program('doxygen', required : true)
doxygen_dot = find_program('dot', required : true)
sphinx_api = find_program('sphinx-apidoc', required : true)
--
GitLab