From 89e1b648f39661e91b2ad502f4843d825fcd6fbf Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 13 Nov 2025 17:21:38 -0500 Subject: Simplify documentation configuration options It's annoying to have to specify online_docs when you're not building the documentation anyway, and this made it possible to configure things so that only htaccess files were installed, which isn't useful. --- doc/ns/ext/meson.build | 20 ++++++++++---------- doc/ns/extensions/meson.build | 20 ++++++++++---------- doc/ns/meson.build | 16 +++++++--------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/doc/ns/ext/meson.build b/doc/ns/ext/meson.build index bf6431b..58aa40d 100644 --- a/doc/ns/ext/meson.build +++ b/doc/ns/ext/meson.build @@ -1,17 +1,8 @@ -# Copyright 2022 David Robillard +# Copyright 2022-2025 David Robillard # SPDX-License-Identifier: 0BSD OR ISC config = configuration_data({'BASE': '/ns/ext'}) -if get_option('online_docs') - htaccess = configure_file( - configuration: config, - input: files('..' / '..' / 'htaccess.in'), - install_dir: lv2_docdir / 'ns' / 'ext', - output: '.htaccess', - ) -endif - spec_names = [ 'atom', 'buf-size', @@ -37,6 +28,15 @@ spec_names = [ ] if build_docs + if get_option('online_docs') + htaccess = configure_file( + configuration: config, + input: files('..' / '..' / 'htaccess.in'), + install_dir: lv2_docdir / 'ns' / 'ext', + output: '.htaccess', + ) + endif + foreach name : spec_names spec_file = files(lv2_source_root / 'lv2' / name + '.lv2' / name + '.ttl') diff --git a/doc/ns/extensions/meson.build b/doc/ns/extensions/meson.build index 837f736..3bf66b4 100644 --- a/doc/ns/extensions/meson.build +++ b/doc/ns/extensions/meson.build @@ -1,23 +1,23 @@ -# Copyright 2022 David Robillard +# Copyright 2022-2025 David Robillard # SPDX-License-Identifier: 0BSD OR ISC config = configuration_data({'BASE': '/ns/extensions'}) -if get_option('online_docs') - htaccess = configure_file( - configuration: config, - input: files('..' / '..' / 'htaccess.in'), - install_dir: lv2_docdir / 'ns' / 'extensions', - output: '.htaccess', - ) -endif - spec_names = [ 'ui', 'units', ] if build_docs + if get_option('online_docs') + htaccess = configure_file( + configuration: config, + input: files('..' / '..' / 'htaccess.in'), + install_dir: lv2_docdir / 'ns' / 'extensions', + output: '.htaccess', + ) + endif + foreach name : spec_names spec_file = files(lv2_source_root / 'lv2' / name + '.lv2' / name + '.ttl') diff --git a/doc/ns/meson.build b/doc/ns/meson.build index 126a100..3189cc2 100644 --- a/doc/ns/meson.build +++ b/doc/ns/meson.build @@ -3,15 +3,6 @@ config = configuration_data({'BASE': '/ns'}) -if get_option('online_docs') - htaccess = configure_file( - configuration: config, - input: files('..' / 'htaccess.in'), - install_dir: lv2_docdir / 'ns', - output: '.htaccess', - ) -endif - ###################### # Core Documentation # ###################### @@ -36,6 +27,13 @@ if build_docs ) if get_option('online_docs') + htaccess = configure_file( + configuration: config, + input: files('..' / 'htaccess.in'), + install_dir: lv2_docdir / 'ns', + output: '.htaccess', + ) + configure_file( copy: true, input: spec_file, -- cgit v1.2.1