git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: Karthik Nayak <karthik.188@gmail.com>,
	toon@iotcl.com,  gitster@pobox.com, phillip.wood123@gmail.com,
	ps@pks.im
Subject: [PATCH v4 0/5] meson: add corresponding target for Makefile's hdr-check
Date: Sun, 20 Apr 2025 14:21:32 +0200	[thread overview]
Message-ID: <20250420-505-wire-up-sparse-via-meson-v4-0-66e14134e822@gmail.com> (raw)
In-Reply-To: <20250408-505-wire-up-sparse-via-meson-v1-0-17476e5cea3f@gmail.com>

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 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

---
 Makefile                       |  4 +-
 ci/run-static-analysis.sh      |  2 +-
 contrib/coccinelle/meson.build | 31 ++++-----------
 meson.build                    | 86 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 98 insertions(+), 25 deletions(-)

Karthik Nayak (5):
      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 v3:

1:  bc69638da5 = 1:  337431cf0f coccinelle: meson: rename variables to be more specific
2:  de50343e66 ! 2:  2b5bde0cb0 meson: move headers definition from 'contrib/coccinelle'
    @@ contrib/coccinelle/meson.build: foreach source : run_command(git, '-C', meson.pr
      
      coccinelle_headers = []
     -foreach header : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_sources, check: true).stdout().split()
    -+foreach header : headers
    ++foreach header : headers_to_check
        coccinelle_headers += meson.project_source_root() / header
      endforeach
      
    @@ meson.build: builtin_sources = [
     +]
     +
     +if git.found()
    -+  headers = []
    ++  headers_to_check = []
     +  foreach header : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_sources, check: true).stdout().split()
    -+    headers += header
    ++    headers_to_check += header
     +  endforeach
     +endif
     +
-:  ---------- > 3:  2c5c9a9dc8 meson: rename 'third_party_sources' to 'third_party_excludes'
3:  fadfc7ef07 ! 4:  5b166c8bcd meson: add support for 'hdr-check'
    @@ Commit message
         the required dependencies.
     
         Also add the 'xdiff/' dir to the list of 'third_party_sources' as those
    -    headers must be skipped from the checks too!
    +    headers must be skipped from the checks too. This also skips the folder
    +    from the 'coccinelle' checks, this is okay, since this code is an
    +    external dependency.
     
         Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
     
      ## meson.build ##
    -@@ meson.build: third_party_sources = [
    -   ':!t/unit-tests/clar',
    +@@ meson.build: third_party_excludes = [
    +   ':!sha1dc',
        ':!t/unit-tests/clar',
        ':!t/t[0-9][0-9][0-9][0-9]*',
     +  ':!xdiff',
      ]
      
      if git.found()
    -@@ meson.build: if git.found()
    -   endforeach
    - endif
    - 
    -+generated_headers = [
    -+  'command-list.h',
    -+]
    -+
    - if not get_option('breaking_changes')
    -   builtin_sources += 'builtin/pack-redundant.c'
    - endif
    -@@ meson.build: builtin_sources += custom_target(
    -   ],
    -   env: script_environment,
    - )
    -+generated_headers += 'config-list.h'
    - 
    - builtin_sources += custom_target(
    -   input: 'Documentation/githooks.adoc',
    -@@ meson.build: builtin_sources += custom_target(
    -   ],
    -   env: script_environment,
    - )
    -+generated_headers += 'hook-list.h'
    - 
    - # This contains the variables for GIT-BUILD-OPTIONS, which we use to propagate
    - # build options to our tests.
     @@ meson.build: endif
      
      subdir('contrib')
      
    -+exclude_from_check_headers = generated_headers
    -+exclude_from_check_headers += [
    ++exclude_from_check_headers = [
     +  'compat/',
     +  'unicode-width.h',
     +]
    @@ meson.build: endif
     +if sha256_backend != 'nettle'
     +  exclude_from_check_headers += 'sha256/nettle.h'
     +endif
    -+if sha256_backend != 'gcrpyt'
    ++if sha256_backend != 'gcrypt'
     +  exclude_from_check_headers += 'sha256/gcrypt.h'
     +endif
     +
     +if git.found() and compiler.get_argument_syntax() == 'gcc'
     +  hco_targets = []
    -+  foreach h : headers
    ++  foreach h : headers_to_check
     +    skip_header = false
     +    foreach exclude : exclude_from_check_headers
     +      if h.startswith(exclude)
4:  66c5798df7 ! 5:  97e2e46dc1 makefile/meson: add 'check-headers' as alias for 'hdr-check'
    @@ meson.build: if git.found() and compiler.get_argument_syntax() == 'gcc'
          hco_targets += hco
        endforeach
      
    +-  alias_target('hdr-check', hco_targets)
     +  # TODO: deprecate 'hdr-check' in lieu of 'check-headers' in Git 2.51+
    -   alias_target('hdr-check', hco_targets)
    -+  alias_target('check-headers', hco_targets)
    ++  hdr_check = alias_target('hdr-check', hco_targets)
    ++  alias_target('check-headers', hdr_check)
      endif
      
      foreach key, value : {


base-commit: 3a956c5f69873611ae5f8dcb9acd117f66b95ddc
change-id: 20250330-505-wire-up-sparse-via-meson-2e32dd31208b

Thanks
- Karthik


  parent reply	other threads:[~2025-04-20 13:19 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 ` Karthik Nayak [this message]
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   ` [PATCH v5 0/6] meson: add corresponding target for Makefile's hdr-check phillip.wood123
2025-04-23 17:40     ` 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=20250420-505-wire-up-sparse-via-meson-v4-0-66e14134e822@gmail.com \
    --to=karthik.188@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood123@gmail.com \
    --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).