From e20ac980fd75125b136cb808ca90717e0565125f Mon Sep 17 00:00:00 2001 From: moozzi Date: Fri, 28 Nov 2025 13:54:13 +0100 Subject: [PATCH v3 2/3] Add `headerscheck` run_target to meson --- meson.build | 15 +++++++++++++++ src/tools/pginclude/headerscheck | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 0a68ebf1598..2ca8d750a3f 100644 --- a/meson.build +++ b/meson.build @@ -3909,6 +3909,21 @@ endif +############################################################### +# headerscheck +############################################################### + +headerscheck = files('src/tools/pginclude/headerscheck') +run_target('headerscheck', + command: [headerscheck, meson.project_source_root(), meson.project_build_root()] +) + +run_target('cpluspluscheck', + command: [headerscheck, '--cplusplus', meson.project_source_root(), meson.project_build_root()] +) + + + ############################################################### # The End, The End, My Friend ############################################################### diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck index a52a5580bdc..a96a462a5ef 100755 --- a/src/tools/pginclude/headerscheck +++ b/src/tools/pginclude/headerscheck @@ -48,8 +48,8 @@ ICU_CFLAGS=`sed -n 's/^ICU_CFLAGS[ ]*=[ ]*//p' "$MGLOB"` CC=`sed -n 's/^CC[ ]*=[ ]*//p' "$MGLOB"` CXX=`sed -n 's/^CXX[ ]*=[ ]*//p' "$MGLOB"` PG_SYSROOT=`sed -n 's/^PG_SYSROOT[ ]*=[ ]*//p' "$MGLOB"` -perl_includespec=`sed -n 's/^perl_includespec[ ]*=[ ]*//p' "$MGLOB"` -python_includespec=`sed -n 's/^python_includespec[ ]*=[ ]*//p' "$MGLOB"` +perl_includespec=`sed -n 's/^perl_includespec[[:space:]]*=[[:space:]]*//p' "$MGLOB"` +python_includespec=`sed -n 's/^python_includespec[[:space:]]*=[[:space:]]*//p' "$MGLOB"` # needed on Darwin CPPFLAGS=`echo "$CPPFLAGS" | sed "s|\\\$(PG_SYSROOT)|$PG_SYSROOT|g"` -- 2.51.0