[PATCH v2] meson: regenerate config-list.h when Documentation changes
- From
D. Ben Knoble <ben.knoble+github@gmail.com>
- Date
- Feb 9, 2026, 15:19 UTC
- Message-ID
- <c9ae171eed6bd5b0fa6671b10a5ad0da024f36d0.1770649805.git.ben.knoble+github@gmail.com>
- In-Reply-To
- <20260207215924.28863-2-ben.knoble+github@gmail.com>
The Meson-based build doesn't know when to rebuild config-list.h, so the header is sometimes stale.
For example, an old build directory might have config-list.h from before 4173df5187 (submodule: introduce extensions.submodulePathConfig, 2026-01-12), which added submodule.<name>.gitdir to the list. Without it, t9902-completion.sh fails. Regenerating the config-list.h artifact from sources fixes the artifact and the test.
Teach the meson build to depend on the Documentation files that generate-configlist.sh reads by having it use the output of generate-configlist-deps.sh as a list of dependency files, since Meson does not have (or want) builtin support for globbing like Make.
Signed-off-by: D. Ben Knoble <ben.knoble+github@gmail.com> ---
Notes (benknoble/commits):
I considered having generate-configlist.sh write its own dependency
list, which Meson also supports… idk though. Input welcome :) This was also built on top of commits [1] on next, but should not depend on
them despite what base-commit and prerequisite-patch-id say. Indeed, it
applies cleanly to master @ 3e0db84c88 (Start 2.54 cycle, 2026-02-05).[1]: https://lore.kernel.org/git/20260207215924.28863-1-ben.knoble+github@gmail.com/
generate-configlist-deps.sh | 5 +++++ meson.build | 1 + 2 files changed, 6 insertions(+) create mode 100755 generate-configlist-deps.sh
diff --git a/generate-configlist-deps.sh b/generate-configlist-deps.sh new file mode 100755 index 0000000000..a873e976b6 --- /dev/null +++ b/generate-configlist-deps.sh @@ -0,0 +1,5 @@ +#! /bin/sh + +printf '%s\n' \ + "$MESON_SOURCE_ROOT"/Documentation/*config.adoc \ + "$MESON_SOURCE_ROOT"/Documentation/config/*.adoc diff --git a/meson.build b/meson.build index 3a1d12caa4..eb6a149c9f 100644 --- a/meson.build +++ b/meson.build @@ -720,6 +720,7 @@ endif builtin_sources += custom_target( output: 'config-list.h', + depend_files: run_command(meson.current_source_dir() + '/generate-configlist-deps.sh', check: true).stdout().strip().split('\n'), command: [ shell, meson.current_source_dir() + '/generate-configlist.sh', Diff-intervalle contre v1 : 1: b03d70c9f3 ! 1: c9ae171eed meson: regenerate config-list.h when Documentation changes @@ meson.build: endif builtin_sources += custom_target( output: 'config-list.h', -+ depend_files: run_command(meson.current_source_dir() + '/generate-configlist-deps').stdout().strip().split('\n'), ++ depend_files: run_command(meson.current_source_dir() + '/generate-configlist-deps.sh', check: true).stdout().strip().split('\n'), command: [ shell, meson.current_source_dir() + '/generate-configlist.sh', base-commit: 64333814d3ac6e46b6b9c308a6398a66743a4022 prerequisite-patch-id: 364ba1899740b93be5957262d3583348d030e8fa
-- 2.52.0.rc0.1018.g3ad6585c12.dirty