diff options
| author | David Robillard <d@drobilla.net> | 2023-04-03 09:00:26 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2023-04-06 07:19:10 -0400 |
| commit | 9e94f1efec34a7328d71eabbf5d21688683946bd (patch) | |
| tree | 0c10b0e64bf7deb17aa33b43125891f9e4dfdad2 | |
| parent | fa38a280abc0e2ee70db9d33886e92d9266936bc (diff) | |
| download | serd-9e94f1efec34a7328d71eabbf5d21688683946bd.tar.gz serd-9e94f1efec34a7328d71eabbf5d21688683946bd.tar.bz2 serd-9e94f1efec34a7328d71eabbf5d21688683946bd.zip | |
Use more consistent meson formatting
| -rw-r--r-- | doc/_static/meson.build | 8 | ||||
| -rw-r--r-- | doc/c/meson.build | 16 | ||||
| -rw-r--r-- | meson.build | 28 | ||||
| -rw-r--r-- | test/meson.build | 4 |
4 files changed, 34 insertions, 22 deletions
diff --git a/doc/_static/meson.build b/doc/_static/meson.build index 3ddb2100..a73a7a7b 100644 --- a/doc/_static/meson.build +++ b/doc/_static/meson.build @@ -1,4 +1,8 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> +# Copyright 2020-2023 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -configure_file(copy: true, input: '../../resources/serd.svg', output: 'serd.svg') +configure_file( + copy: true, + input: '../../resources/serd.svg', + output: 'serd.svg', +) diff --git a/doc/c/meson.build b/doc/c/meson.build index 8c4934de..55da7cb0 100644 --- a/doc/c/meson.build +++ b/doc/c/meson.build @@ -1,4 +1,4 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> +# Copyright 2020-2023 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC # Check for Sphinx LV2 theme @@ -55,8 +55,11 @@ subdir('api') custom_target( 'singlehtml', build_by_default: true, - command: [sphinx_build, '-M', 'singlehtml', '@OUTDIR@', '@OUTDIR@', - '-E', '-q', '-t', 'singlehtml'], + command: [ + sphinx_build, + '-M', 'singlehtml', '@OUTDIR@', '@OUTDIR@', + '-E', '-q', '-t', 'singlehtml', + ], input: [c_rst_files, c_serd_rst, c_index_xml, conf_py], install: true, install_dir: docdir / versioned_name, @@ -66,8 +69,11 @@ custom_target( custom_target( 'html', build_by_default: true, - command: [sphinx_build, '-M', 'html', '@OUTDIR@', '@OUTDIR@', - '-E', '-q', '-t', 'html'], + command: [ + sphinx_build, + '-M', 'html', '@OUTDIR@', '@OUTDIR@', + '-E', '-q', '-t', 'html', + ], input: [c_rst_files, c_serd_rst, c_index_xml, conf_py], install: true, install_dir: docdir / versioned_name, diff --git a/meson.build b/meson.build index 0c0a41c2..f1b75cd6 100644 --- a/meson.build +++ b/meson.build @@ -1,17 +1,20 @@ # Copyright 2021-2023 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -project('serd', ['c'], - version: '0.31.1', - license: 'ISC', - meson_version: '>= 0.56.0', - default_options: [ - 'b_ndebug=if-release', - 'buildtype=release', - 'warning_level=3', - 'c_std=c99', - 'c_winlibs=[]', - ]) +project( + 'serd', + ['c'], + default_options: [ + 'b_ndebug=if-release', + 'buildtype=release', + 'c_std=c99', + 'c_winlibs=[]', + 'warning_level=3', + ], + license: 'ISC', + meson_version: '>= 0.56.0', + version: '0.31.1', +) serd_src_root = meson.current_source_dir() major_version = meson.project_version().split('.')[0] @@ -70,8 +73,7 @@ else # Define HAVE_SOMETHING symbols for all detected features template = '#include <@0@>\nint main(void) { @1@; }' if cc.links( - template.format('stdio.h', - 'return fileno(stdin);'), + template.format('stdio.h', 'return fileno(stdin);'), args: system_c_args, name: 'fileno') platform_c_args += ['-DHAVE_FILENO'] diff --git a/test/meson.build b/test/meson.build index 283ce3e8..07b5818f 100644 --- a/test/meson.build +++ b/test/meson.build @@ -2,7 +2,6 @@ # SPDX-License-Identifier: 0BSD OR ISC run_suite = find_program('run_suite.py') - wrapper = meson.get_external_property('exe_wrapper', '') ######################## @@ -268,7 +267,8 @@ if is_variable('serdi') foreach name, args : test_suites test( - name, run_suite, + name, + run_suite, args: script_args + args, suite: ['suite'], timeout: 240, |