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>,
	jltobler@gmail.com,  toon@iotcl.com
Subject: [PATCH v2 2/4] meson: move headers definition from 'contrib/coccinelle'
Date: Thu, 10 Apr 2025 13:30:32 +0200	[thread overview]
Message-ID: <20250410-505-wire-up-sparse-via-meson-v2-2-acb45cc8a2e5@gmail.com> (raw)
In-Reply-To: <20250410-505-wire-up-sparse-via-meson-v2-0-acb45cc8a2e5@gmail.com>

The meson build for coccinelle static analysis lists all headers to
analyse. Due to the way meson exports variables between subdirs, this
variable is also available in the root meson build.

An upcoming commit, will add a new check complimenting 'hdr-check' in
the Makefile. This would require the list of headers. So move the
'coccinelle_headers' to the root meson build and rename it to 'headers',
remove the root path being appended to each header and retain that in
the coccinelle meson build since it is specific to the coccinelle build.

Also move the 'third_party_sources' variable to the root meson build
since it is also a dependency for the 'headers' variable. This also
makes it easier to understand as the variable is now propagated from the
top level to the bottom.

Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
 contrib/coccinelle/meson.build | 17 +----------------
 meson.build                    | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/contrib/coccinelle/meson.build b/contrib/coccinelle/meson.build
index 03ce52d752..32568c5103 100644
--- a/contrib/coccinelle/meson.build
+++ b/contrib/coccinelle/meson.build
@@ -8,21 +8,6 @@ if not spatch.found()
   subdir_done()
 endif
 
-third_party_sources = [
-  ':!contrib',
-  ':!compat/inet_ntop.c',
-  ':!compat/inet_pton.c',
-  ':!compat/nedmalloc',
-  ':!compat/obstack.*',
-  ':!compat/poll',
-  ':!compat/regex',
-  ':!sha1collisiondetection',
-  ':!sha1dc',
-  ':!t/unit-tests/clar',
-  ':!t/unit-tests/clar',
-  ':!t/t[0-9][0-9][0-9][0-9]*',
-]
-
 rules = [
   'array.cocci',
   'commit.cocci',
@@ -61,7 +46,7 @@ foreach source : run_command(git, '-C', meson.project_source_root(), 'ls-files',
 endforeach
 
 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
   coccinelle_headers += meson.project_source_root() / header
 endforeach
 
diff --git a/meson.build b/meson.build
index e98cfa4909..790d178007 100644
--- a/meson.build
+++ b/meson.build
@@ -633,6 +633,28 @@ builtin_sources = [
   'builtin/write-tree.c',
 ]
 
+third_party_sources = [
+  ':!contrib',
+  ':!compat/inet_ntop.c',
+  ':!compat/inet_pton.c',
+  ':!compat/nedmalloc',
+  ':!compat/obstack.*',
+  ':!compat/poll',
+  ':!compat/regex',
+  ':!sha1collisiondetection',
+  ':!sha1dc',
+  ':!t/unit-tests/clar',
+  ':!t/unit-tests/clar',
+  ':!t/t[0-9][0-9][0-9][0-9]*',
+]
+
+headers = []
+if git.found()
+  foreach header : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_sources, check: true).stdout().split()
+    headers += header
+  endforeach
+endif
+
 if not get_option('breaking_changes')
   builtin_sources += 'builtin/pack-redundant.c'
 endif

-- 
2.48.1


  parent reply	other threads:[~2025-04-10 11:30 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   ` Karthik Nayak [this message]
2025-04-11 10:06     ` [PATCH v2 2/4] meson: move headers definition from 'contrib/coccinelle' 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   ` [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=20250410-505-wire-up-sparse-via-meson-v2-2-acb45cc8a2e5@gmail.com \
    --to=karthik.188@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jltobler@gmail.com \
    --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).