From ce64e8f3abbc2254acc53dcb6200c6a368197c51 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 26 Sep 2022 13:08:56 -0700 Subject: [PATCH v17 23/23] meson: wip: headerchecks cpluspluschecks --- src/include/meson.build | 4 ++-- src/meson.build | 7 +++++++ src/tools/pginclude/cpluspluscheck | 4 ++-- src/tools/pginclude/headerscheck | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/include/meson.build b/src/include/meson.build index 35c06c4856a..f20614573ce 100644 --- a/src/include/meson.build +++ b/src/include/meson.build @@ -42,9 +42,9 @@ config_paths_data.set_quoted('MANDIR', dir_prefix / dir_man) var_cc = ' '.join(cc.cmd_array()) var_cpp = ' '.join(cc.cmd_array() + ['-E']) -var_cflags = ' '.join(cflags + cflags_warn + get_option('c_args')) +var_cflags = ' '.join(cflags + cflags_warn + get_option('c_args') + ['-Wall']) if llvm.found() - var_cxxflags = ' '.join(cxxflags + cxxflags_warn + get_option('cpp_args')) + var_cxxflags = ' '.join(cxxflags + cxxflags_warn + get_option('cpp_args') + ['-Wall']) else var_cxxflags = '' endif diff --git a/src/meson.build b/src/meson.build index 8aa91940cec..788ea4d299e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -272,3 +272,10 @@ install_data( install_data( 'makefiles/pgxs.mk', install_dir: dir_pgxs / 'src' / 'makefiles') + + +run_target('headerscheck', + command: [files('tools/pginclude/headerscheck'), '@SOURCE_ROOT@', '@BUILD_ROOT@']) + +run_target('cpluspluscheck', + command: [files('tools/pginclude/cpluspluscheck'), '@SOURCE_ROOT@', '@BUILD_ROOT@']) diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck index b393f2a2eaa..aeaaaa67479 100755 --- a/src/tools/pginclude/cpluspluscheck +++ b/src/tools/pginclude/cpluspluscheck @@ -166,9 +166,9 @@ do # Some subdirectories need extra -I switches. case "$f" in src/pl/plperl/*) - EXTRAINCLUDES="$perl_includespec" ;; + EXTRAINCLUDES="$perl_includespec"; continue; ;; src/pl/plpython/*) - EXTRAINCLUDES="$python_includespec" ;; + EXTRAINCLUDES="$python_includespec"; continue; ;; src/interfaces/ecpg/*) EXTRAINCLUDES="-I $builddir/src/interfaces/ecpg/include -I $srcdir/src/interfaces/ecpg/include" ;; src/backend/parser/*) diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck index 2a39856f88c..cc195ccc88f 100755 --- a/src/tools/pginclude/headerscheck +++ b/src/tools/pginclude/headerscheck @@ -149,9 +149,9 @@ do # Some subdirectories need extra -I switches. case "$f" in src/pl/plperl/*) - EXTRAINCLUDES="$perl_includespec" ;; + EXTRAINCLUDES="$perl_includespec"; continue; ;; src/pl/plpython/*) - EXTRAINCLUDES="$python_includespec" ;; + EXTRAINCLUDES="$python_includespec"; continue; ;; src/interfaces/ecpg/*) EXTRAINCLUDES="-I $builddir/src/interfaces/ecpg/include -I $srcdir/src/interfaces/ecpg/include" ;; src/backend/parser/*) -- 2.37.3.542.gdd3f6c4cae