From 9b8d847284eea14d64d8d22cefde8103dee41132 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 7 Oct 2022 14:53:16 -0400 Subject: Clean up meson definitions --- doc/_static/meson.build | 6 +++++- doc/c/api/meson.build | 3 ++- doc/c/meson.build | 22 +++++++++++++--------- doc/c/xml/meson.build | 18 +++++++++++------- doc/cpp/api/meson.build | 3 ++- doc/cpp/meson.build | 22 +++++++++++++--------- doc/cpp/xml/meson.build | 11 +++++++---- 7 files changed, 53 insertions(+), 32 deletions(-) (limited to 'doc') diff --git a/doc/_static/meson.build b/doc/_static/meson.build index d3296c6..ffaefcd 100644 --- a/doc/_static/meson.build +++ b/doc/_static/meson.build @@ -1,5 +1,9 @@ # Copyright 2021 David Robillard # SPDX-License-Identifier: CC0-1.0 OR ISC -configure_file(copy: true, input: '../../resources/pugl.svg', output: 'pugl.svg') +configure_file( + copy: true, + input: '../../resources/pugl.svg', + output: 'pugl.svg', +) diff --git a/doc/c/api/meson.build b/doc/c/api/meson.build index 001d908..7f5d26d 100644 --- a/doc/c/api/meson.build +++ b/doc/c/api/meson.build @@ -5,4 +5,5 @@ c_pugl_rst = custom_target( 'C API ReST Documentation', command: [dox_to_sphinx, '-f', '@INPUT0@', 'doc/c/api'], input: [c_index_xml] + c_rst_files, - output: 'pugl.rst') + output: 'pugl.rst', +) diff --git a/doc/c/meson.build b/doc/c/meson.build index 7954776..969727a 100644 --- a/doc/c/meson.build +++ b/doc/c/meson.build @@ -4,9 +4,11 @@ config = configuration_data() config.set('PUGL_VERSION', meson.project_version()) -conf_py = configure_file(configuration: config, - input: '../conf.py.in', - output: 'conf.py') +conf_py = configure_file( + configuration: config, + input: '../conf.py.in', + output: 'conf.py', +) configure_file(copy: true, input: '../deployment.rst', output: 'deployment.rst') configure_file(copy: true, input: '../summary.rst', output: 'summary.rst') @@ -31,20 +33,22 @@ subdir('api') docs = custom_target( 'singlehtml', + build_by_default: true, command: [sphinx_build, '-M', 'singlehtml', '@OUTDIR@', '@OUTDIR@', '-E', '-q', '-t', 'singlehtml'], input: [c_rst_files, c_pugl_rst, c_index_xml], - output: 'singlehtml', - build_by_default: true, install: true, - install_dir: docdir / 'pugl-0') + install_dir: docdir / 'pugl-0', + output: 'singlehtml', +) docs = custom_target( 'html', + build_by_default: true, command: [sphinx_build, '-M', 'html', '@OUTDIR@', '@OUTDIR@', '-E', '-q', '-t', 'html'], input: [c_rst_files, c_pugl_rst, c_index_xml], - output: 'html', - build_by_default: true, install: true, - install_dir: docdir / 'pugl-0') + install_dir: docdir / 'pugl-0', + output: 'html', +) diff --git a/doc/c/xml/meson.build b/doc/c/xml/meson.build index 7dfadbb..e1b715e 100644 --- a/doc/c/xml/meson.build +++ b/doc/c/xml/meson.build @@ -10,11 +10,15 @@ config = configuration_data() config.set('PUGL_SRCDIR', pugl_src_root) config.set('DOX_OUTPUT', meson.current_build_dir() / '..') -c_doxyfile = configure_file(configuration: config, - input: '../Doxyfile.in', - output: 'Doxyfile') +c_doxyfile = configure_file( + configuration: config, + input: '../Doxyfile.in', + output: 'Doxyfile', +) -c_index_xml = custom_target('c-index.xml', - command: [doxygen, '@INPUT0@'], - input: [c_doxyfile] + c_header_files, - output: 'index.xml') +c_index_xml = custom_target( + 'c-index.xml', + command: [doxygen, '@INPUT0@'], + input: [c_doxyfile] + c_header_files, + output: 'index.xml', +) diff --git a/doc/cpp/api/meson.build b/doc/cpp/api/meson.build index 9c81f6f..9ccdd0b 100644 --- a/doc/cpp/api/meson.build +++ b/doc/cpp/api/meson.build @@ -5,4 +5,5 @@ cpp_pugl_rst = custom_target( 'C++ API ReST Documentation', command: [dox_to_sphinx, '-l', 'cpp', '-f', '@INPUT@', '@OUTDIR@'], input: cpp_index_xml, - output: 'pugl.rst') + output: 'pugl.rst', +) diff --git a/doc/cpp/meson.build b/doc/cpp/meson.build index 559362d..bc7af98 100644 --- a/doc/cpp/meson.build +++ b/doc/cpp/meson.build @@ -4,9 +4,11 @@ config = configuration_data() config.set('PUGL_VERSION', meson.project_version()) -conf_py = configure_file(configuration: config, - input: '../conf.py.in', - output: 'conf.py') +conf_py = configure_file( + configuration: config, + input: '../conf.py.in', + output: 'conf.py', +) configure_file(copy: true, input: '../deployment.rst', output: 'deployment.rst') configure_file(copy: true, input: '../summary.rst', output: 'summary.rst') @@ -29,20 +31,22 @@ subdir('api') docs = custom_target( 'singlehtml', + build_by_default: true, command: [sphinx_build, '-M', 'singlehtml', '@OUTDIR@', '@OUTDIR@', '-E', '-q', '-t', 'singlehtml'], input: [cpp_rst_files, cpp_pugl_rst, cpp_index_xml], - output: 'singlehtml', - build_by_default: true, install: true, - install_dir: docdir / 'puglpp-0') + install_dir: docdir / 'puglpp-0', + output: 'singlehtml', +) docs = custom_target( 'html', command: [sphinx_build, '-M', 'html', '@OUTDIR@', '@OUTDIR@', '-E', '-q', '-t', 'html'], - input: [cpp_rst_files, cpp_pugl_rst, cpp_index_xml], - output: 'html', build_by_default: true, + input: [cpp_rst_files, cpp_pugl_rst, cpp_index_xml], install: true, - install_dir: docdir / 'puglpp-0') + install_dir: docdir / 'puglpp-0', + output: 'html', +) diff --git a/doc/cpp/xml/meson.build b/doc/cpp/xml/meson.build index 294cbf2..618d1b9 100644 --- a/doc/cpp/xml/meson.build +++ b/doc/cpp/xml/meson.build @@ -10,13 +10,16 @@ config = configuration_data() config.set('PUGL_SRCDIR', pugl_src_root) config.set('DOX_OUTPUT', meson.current_build_dir() / '..') -cpp_doxyfile = configure_file(configuration: config, - input: '../Doxyfile.in', - output: 'Doxyfile') +cpp_doxyfile = configure_file( + configuration: config, + input: '../Doxyfile.in', + output: 'Doxyfile', +) cpp_index_xml = custom_target( 'cpp-index.xml', command: [doxygen, '@INPUT0@'], input: [cpp_doxyfile] + c_header_files + cpp_header_files, - output: 'index.xml') + output: 'index.xml', +) -- cgit v1.2.1