From 16872ecc4137a5a58f9da8e62990d5587afbec21 Mon Sep 17 00:00:00 2001 From: sewn Date: Wed, 14 Jun 2023 12:26:19 +0000 Subject: [PATCH] meson: use meson feed feature for scdoc input Removes the need for a shell dependency. --- CHANGELOG.md | 2 ++ doc/meson.build | 5 ++--- meson.build | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a26dad6..692784ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ ### Changed +* Minimum required meson version is now 0.59 ([#1371][1371]). * Kitty keyboard protocol: F3 is now encoded as `CSI 13~` instead of `CSI R`. The kitty keyboard protocol originally allowed F3 to be encoded as `CSI R`, but this was removed from the specification @@ -65,6 +66,7 @@ background color is the **default** background color) ([#1360][1360]). +[1371]: https://codeberg.org/dnkl/foot/pulls/1371 [1360]: https://codeberg.org/dnkl/foot/issues/1360 diff --git a/doc/meson.build b/doc/meson.build index 17f09f39..37972652 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,5 +1,3 @@ -sh = find_program('sh', native: true) - scdoc_prog = find_program(scdoc.get_variable('scdoc'), native: true) if utmp_backend != 'none' @@ -43,8 +41,9 @@ foreach man_src : [{'name': 'foot', 'section' : 1}, out, output: out, input: preprocessed, - command: [sh, '-c', '@0@ < @INPUT@'.format(scdoc_prog.full_path())], + command: scdoc_prog.full_path(), capture: true, + feed: true, install: true, install_dir: join_paths(get_option('mandir'), 'man@0@'.format(section))) endforeach diff --git a/meson.build b/meson.build index c5ef1928..29951541 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('foot', 'c', version: '1.14.0', license: 'MIT', - meson_version: '>=0.58.0', + meson_version: '>=0.59.0', default_options: [ 'c_std=c11', 'warning_level=1',