From: phillip.wood123@gmail.com
To: Karthik Nayak <karthik.188@gmail.com>, git@vger.kernel.org
Cc: toon@iotcl.com, gitster@pobox.com, ps@pks.im
Subject: Re: [PATCH v5 0/6] meson: add corresponding target for Makefile's hdr-check
Date: Wed, 23 Apr 2025 11:05:30 +0100 [thread overview]
Message-ID: <8a907622-a975-4f9c-86b3-54b8f5447709@gmail.com> (raw)
In-Reply-To: <20250423-505-wire-up-sparse-via-meson-v5-0-d1e2be4b2078@gmail.com>
Hi Karthik
This looks good, I've left a couple of comments but I don't think there
is anything that necessitates a re-roll.
Thanks
Phillip
On 23/04/2025 09:15, Karthik Nayak wrote:
> To bridge the remaining gaps between Makefile and Meson, this patch
> series adds 'hdr-check' to Meson to compliment the Makefile's
> 'hdr-check'.
>
> We also introduce 'headers-check' as an alias to 'hdr-check' as a better
> named replacement in both Meson and make and add a note to deprecate
> 'hdr-check' in the future.
>
> The first two commits are small cleanups, where we re-organize existing
> variables to make it easier to add the target. The third commit adds the
> 'hdr-check' target to Meson. The last commit introduces the
> 'headers-check' alias to both Meson and the makefile and marks
> 'hdr-check' to be deprecated.
>
> This is based on master 9d22ac5122 (The third batch, 2025-04-07) with
> 'es/meson-build-skip-coccinelle' merged in.
>
> ---
> Changes in v5:
> - Add a commit to install 'git' in GitHub's CI before the repository is
> checked out. Without the presence of the 'git' executable, GitHub
> downloads a tar of the repo instead of cloning it. This causes the
> patch series to fail in CI.
> - Expose the 'headers_to_check' variable even if 'git' executable is not
> found or not a repository. This ensures dependencies of
> 'headers_to_check' can simply rely on its length. We also check that
> the '.git' folder is setup before populating 'headers_to_check', this
> ensures Meson doesn't fail in tarball of the Git source code.
> - Link to v4: https://lore.kernel.org/r/20250420-505-wire-up-sparse-via-meson-v4-0-66e14134e822@gmail.com
>
> Changes in v4:
> - Rename headers to headers_to_check, since these headers are only used
> for static analysis.
> - Added a commit to rename third_party_sources -> third_party_excludes
> and remove a duplicate.
> - Fix a typo 'gcrpyt' -> 'gcrypt'
> - Remove 'generated_headers', since we use 'git ls-files' and that would
> already ignore files within '.gitignore'.
> - Link to v3: https://lore.kernel.org/r/20250414-505-wire-up-sparse-via-meson-v3-0-edc6e7f26745@gmail.com
>
> Changes in v3:
> - Some renames:
> - headers_generated -> generated_headers
> - meson -> Meson
> - headers-check -> check-headers
> - headers_check_exclude -> exclude_from_check_headers
> - Rewrite 'headers_check_exclude' to also contain dirs so we can skip
> listing individual header files.
> - Move 'xdiff/*' to 'third_party_sources' and cleanup
> 'exclude_from_check_headers'.
> - Use 'echo' instead of 'echo -n'.
> - Use `fs.replace_suffix` instead of `str.replace`.
> - Link to v2: https://lore.kernel.org/r/20250410-505-wire-up-sparse-via-meson-v2-0-acb45cc8a2e5@gmail.com
>
> Changes in v2:
> - Add 'hdr-check' to meson, while introducing 'headers-check' as
> a replacement alias. Schedule 'hdr-check' to be deprecated in the future.
> - Link to v1: https://lore.kernel.org/r/20250408-505-wire-up-sparse-via-meson-v1-0-17476e5cea3f@gmail.com
>
> ---
> .github/workflows/main.yml | 14 +++++++
> Makefile | 4 +-
> ci/run-static-analysis.sh | 2 +-
> contrib/coccinelle/meson.build | 31 ++++-----------
> meson.build | 86 ++++++++++++++++++++++++++++++++++++++++++
> 5 files changed, 112 insertions(+), 25 deletions(-)
>
> Karthik Nayak (6):
> ci/github: install git before checking out the repository
> coccinelle: meson: rename variables to be more specific
> meson: move headers definition from 'contrib/coccinelle'
> meson: rename 'third_party_sources' to 'third_party_excludes'
> meson: add support for 'hdr-check'
> makefile/meson: add 'check-headers' as alias for 'hdr-check'
>
> Range-diff versus v4:
>
> -: ---------- > 1: d20993a59e ci/github: install git before checking out the repository
> 1: 0f1160fa78 = 2: 6eb10dd3b1 coccinelle: meson: rename variables to be more specific
> 2: 933b199def ! 3: 7950b44c6f meson: move headers definition from 'contrib/coccinelle'
> @@ Commit message
> makes it easier to understand as the variable is now propagated from the
> top level to the bottom.
>
> + While 'headers_to_check' is only computed when we have a repository and
> + the 'git' executable is present, the variable itself is exposed as an
> + empty array. This allows dependencies in upcoming commits to simply
> + check for length of the array and not worry about dependencies required
> + to actually populate the array.
> +
> Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
>
> ## contrib/coccinelle/meson.build ##
> @@ meson.build: builtin_sources = [
> + ':!t/t[0-9][0-9][0-9][0-9]*',
> +]
> +
> -+if git.found()
> -+ headers_to_check = []
> ++headers_to_check = []
> ++if git.found() and fs.exists(meson.project_source_root() / '.git')
> + foreach header : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_sources, check: true).stdout().split()
> + headers_to_check += header
> + endforeach
> 3: ab04192864 ! 4: 7fd64b788b meson: rename 'third_party_sources' to 'third_party_excludes'
> @@ meson.build: third_party_sources = [
> ':!t/t[0-9][0-9][0-9][0-9]*',
> ]
>
> - if git.found()
> - headers_to_check = []
> + headers_to_check = []
> + if git.found() and fs.exists(meson.project_source_root() / '.git')
> - foreach header : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_sources, check: true).stdout().split()
> + foreach header : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_excludes, check: true).stdout().split()
> headers_to_check += header
> 4: 69a4b5abc9 ! 5: df0472be57 meson: add support for 'hdr-check'
> @@ meson.build: third_party_excludes = [
> + ':!xdiff',
> ]
>
> - if git.found()
> + headers_to_check = []
> @@ meson.build: endif
>
> subdir('contrib')
> @@ meson.build: endif
> + exclude_from_check_headers += 'sha256/gcrypt.h'
> +endif
> +
> -+if git.found() and compiler.get_argument_syntax() == 'gcc'
> ++if headers_to_check.length() != 0 and compiler.get_argument_syntax() == 'gcc'
> + hco_targets = []
> + foreach h : headers_to_check
> + skip_header = false
> 5: a0c799cf8c ! 6: 7d9a33767b makefile/meson: add 'check-headers' as alias for 'hdr-check'
> @@ ci/run-static-analysis.sh: then
> make check-pot
>
> ## meson.build ##
> -@@ meson.build: if git.found() and compiler.get_argument_syntax() == 'gcc'
> +@@ meson.build: if headers_to_check.length() != 0 and compiler.get_argument_syntax() == 'gcc'
> hco_targets += hco
> endforeach
>
>
>
> base-commit: 3a956c5f69873611ae5f8dcb9acd117f66b95ddc
> change-id: 20250330-505-wire-up-sparse-via-meson-2e32dd31208b
>
> Thanks
> - Karthik
>
next prev parent reply other threads:[~2025-04-23 10:05 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-08 14:55 [PATCH 0/3] meson: add corresponding target for Makefile's hdr-check Karthik Nayak
2025-04-08 14:55 ` [PATCH 1/3] coccinelle: meson: rename variables to be more specific Karthik Nayak
2025-04-08 14:55 ` [PATCH 2/3] meson: move headers definition from 'contrib/coccinelle' Karthik Nayak
2025-04-08 14:55 ` [PATCH 3/3] meson: add support for 'headers-check' Karthik Nayak
2025-04-08 22:19 ` Junio C Hamano
2025-04-10 9:13 ` Karthik Nayak
2025-04-10 11:30 ` [PATCH v2 0/4] meson: add corresponding target for Makefile's hdr-check Karthik Nayak
2025-04-10 11:30 ` [PATCH v2 1/4] coccinelle: meson: rename variables to be more specific Karthik Nayak
2025-04-10 11:30 ` [PATCH v2 2/4] meson: move headers definition from 'contrib/coccinelle' Karthik Nayak
2025-04-11 10:06 ` Patrick Steinhardt
2025-04-11 12:13 ` Karthik Nayak
2025-04-10 11:30 ` [PATCH v2 3/4] meson: add support for 'hdr-check' Karthik Nayak
2025-04-10 14:50 ` Phillip Wood
2025-04-10 19:06 ` Junio C Hamano
2025-04-14 13:49 ` Karthik Nayak
2025-04-11 10:06 ` Patrick Steinhardt
2025-04-14 14:03 ` Karthik Nayak
2025-04-14 8:45 ` Toon Claes
2025-04-14 14:25 ` Karthik Nayak
2025-04-10 11:30 ` [PATCH v2 4/4] makefile/meson: add 'headers-check' as alias " Karthik Nayak
2025-04-10 14:50 ` Phillip Wood
2025-04-10 18:58 ` Junio C Hamano
2025-04-14 14:27 ` Karthik Nayak
2025-04-14 21:15 ` [PATCH v3 0/4] meson: add corresponding target for Makefile's hdr-check Karthik Nayak
2025-04-14 21:15 ` [PATCH v3 1/4] coccinelle: meson: rename variables to be more specific Karthik Nayak
2025-04-14 21:16 ` [PATCH v3 2/4] meson: move headers definition from 'contrib/coccinelle' Karthik Nayak
2025-04-15 13:28 ` Phillip Wood
2025-04-20 10:09 ` Karthik Nayak
2025-04-14 21:16 ` [PATCH v3 3/4] meson: add support for 'hdr-check' Karthik Nayak
2025-04-14 22:11 ` Junio C Hamano
2025-04-15 6:43 ` Karthik Nayak
2025-04-15 13:28 ` phillip.wood123
2025-04-20 10:57 ` Karthik Nayak
2025-04-14 21:16 ` [PATCH v3 4/4] makefile/meson: add 'check-headers' as alias " Karthik Nayak
2025-04-15 13:28 ` phillip.wood123
2025-04-20 11:02 ` Karthik Nayak
2025-04-20 12:21 ` [PATCH v4 0/5] meson: add corresponding target for Makefile's hdr-check Karthik Nayak
2025-04-20 12:21 ` [PATCH v4 1/5] coccinelle: meson: rename variables to be more specific Karthik Nayak
2025-04-20 12:21 ` [PATCH v4 2/5] meson: move headers definition from 'contrib/coccinelle' Karthik Nayak
2025-04-20 12:21 ` [PATCH v4 3/5] meson: rename 'third_party_sources' to 'third_party_excludes' Karthik Nayak
2025-04-20 12:21 ` [PATCH v4 4/5] meson: add support for 'hdr-check' Karthik Nayak
2025-04-20 12:21 ` [PATCH v4 5/5] makefile/meson: add 'check-headers' as alias " Karthik Nayak
2025-04-21 7:48 ` [PATCH v4 0/5] meson: add corresponding target for Makefile's hdr-check Junio C Hamano
2025-04-21 8:45 ` Phillip Wood
2025-04-21 15:33 ` Karthik Nayak
2025-04-22 13:24 ` Phillip Wood
2025-04-22 14:10 ` Karthik Nayak
2025-04-22 15:55 ` Junio C Hamano
2025-04-23 1:17 ` Eli Schwartz
2025-04-23 10:04 ` Phillip Wood
2025-04-22 18:56 ` Karthik Nayak
2025-04-23 10:05 ` Phillip Wood
2025-04-21 15:41 ` Junio C Hamano
2025-04-21 18:54 ` Phillip Wood
2025-04-21 20:40 ` Junio C Hamano
2025-04-23 10:04 ` Phillip Wood
2025-04-22 6:57 ` Patrick Steinhardt
2025-04-21 20:08 ` Karthik Nayak
2025-04-21 23:33 ` Junio C Hamano
2025-04-22 9:11 ` Karthik Nayak
2025-04-22 15:56 ` Junio C Hamano
2025-04-23 8:15 ` [PATCH v5 0/6] " Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 1/6] ci/github: install git before checking out the repository Karthik Nayak
2025-04-23 10:05 ` phillip.wood123
2025-04-23 17:39 ` Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 2/6] coccinelle: meson: rename variables to be more specific Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 3/6] meson: move headers definition from 'contrib/coccinelle' Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 4/6] meson: rename 'third_party_sources' to 'third_party_excludes' Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 5/6] meson: add support for 'hdr-check' Karthik Nayak
2025-04-23 10:05 ` phillip.wood123
2025-04-23 17:40 ` Karthik Nayak
2025-04-23 8:15 ` [PATCH v5 6/6] makefile/meson: add 'check-headers' as alias " Karthik Nayak
2025-04-23 11:30 ` Patrick Steinhardt
2025-04-23 17:41 ` Karthik Nayak
2025-04-23 10:05 ` phillip.wood123 [this message]
2025-04-23 17:40 ` [PATCH v5 0/6] meson: add corresponding target for Makefile's hdr-check Junio C Hamano
2025-04-23 20:04 ` Junio C Hamano
2025-04-23 20:22 ` Junio C Hamano
2025-04-23 21:22 ` Karthik Nayak
2025-04-23 21:54 ` Junio C Hamano
2025-04-23 22:12 ` Karthik Nayak
2025-04-23 17:42 ` Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8a907622-a975-4f9c-86b3-54b8f5447709@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karthik.188@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=ps@pks.im \
--cc=toon@iotcl.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).