aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarthik Nayak <karthik.188@gmail.com>2025-04-23 10:15:37 +0200
committerJunio C Hamano <gitster@pobox.com>2025-04-23 10:36:18 -0700
commit7e873eb390204dbe55ec4101fb7ab737f5ae0bc6 (patch)
treebf71c4a4861c10e03b8d83224242dfdb3ac32f53
parent1597b6e86e3c13438a0e469b10048e73039e8023 (diff)
downloadgit-7e873eb390204dbe55ec4101fb7ab737f5ae0bc6.tar.xz
meson: rename 'third_party_sources' to 'third_party_excludes'
The 'third_party_sources' variable was moved to the root 'meson.build' file in the previous commit. The variable is actually used to exclude third party sources, so rename it accordingly to 'third_party_excludes' to avoid confusion. While here, remove a duplicate from the list. Signed-off-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--contrib/coccinelle/meson.build2
-rw-r--r--meson.build5
2 files changed, 3 insertions, 4 deletions
diff --git a/contrib/coccinelle/meson.build b/contrib/coccinelle/meson.build
index 4f07824402..dc3f73c2e7 100644
--- a/contrib/coccinelle/meson.build
+++ b/contrib/coccinelle/meson.build
@@ -41,7 +41,7 @@ concatenated_rules = custom_target(
)
coccinelle_sources = []
-foreach source : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.c', third_party_sources, check: true).stdout().split()
+foreach source : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.c', third_party_excludes, check: true).stdout().split()
coccinelle_sources += source
endforeach
diff --git a/meson.build b/meson.build
index e147ddff28..4618804c7a 100644
--- a/meson.build
+++ b/meson.build
@@ -633,7 +633,7 @@ builtin_sources = [
'builtin/write-tree.c',
]
-third_party_sources = [
+third_party_excludes = [
':!contrib',
':!compat/inet_ntop.c',
':!compat/inet_pton.c',
@@ -644,13 +644,12 @@ third_party_sources = [
':!sha1collisiondetection',
':!sha1dc',
':!t/unit-tests/clar',
- ':!t/unit-tests/clar',
':!t/t[0-9][0-9][0-9][0-9]*',
]
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
endforeach
endif