diff options
| author | Andres Freund <andres@anarazel.de> | 2019-05-31 12:36:17 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2019-05-31 12:36:17 -0700 |
| commit | b1cd7ce23f40e1e443b3f2ab127bbe8348add678 (patch) | |
| tree | 7f9485b6d7060529b2d3c6dfd38de76c59728d9c /src | |
| parent | 72b6223f766d6ba9076d7b1ebdf05df75e83ba5c (diff) | |
| download | postgresql-b1cd7ce23f40e1e443b3f2ab127bbe8348add678.tar.gz postgresql-b1cd7ce23f40e1e443b3f2ab127bbe8348add678.zip | |
Integrate cpluspluscheck into build system.
Previously cpluspluscheck wouldn't work in vpath builds, this commit
fixes that. To make it easier to invoke, there's a top-level
cpluspluscheck target.
Discussion: https://postgr.es/20190530220244.kiputcbl4gkl2oo6@alap3.anarazel.de
Diffstat (limited to 'src')
| -rwxr-xr-x | src/tools/pginclude/cpluspluscheck | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck index 3a771c48b62..72a9d47677e 100755 --- a/src/tools/pginclude/cpluspluscheck +++ b/src/tools/pginclude/cpluspluscheck @@ -1,9 +1,27 @@ #!/bin/sh # Check all exported PostgreSQL include files for C++ compatibility. -# Run this from the top-level source directory after performing a build. +# +# Argument 1 is the top-level source directory, argument 2 the +# top-level build directory (they might be the same). If not set, they +# default to the current directory. +# +# Needs to be run after all generated headers are created. +# # No output if everything is OK, else compiler errors. +if [ -z "$1" ];then + srcdir="." +else + srcdir="$1" +fi + +if [ -z "$2" ];then + builddir="$." +else + builddir="$2" +fi + me=`basename $0` tmp=`mktemp -d /tmp/$me.XXXXXX` @@ -22,7 +40,7 @@ trap 'rm -rf $tmp' 0 1 2 3 15 # which itself contains C++ code and so won't compile with a C++ # compiler under extern "C" linkage. -for f in `find src/include src/interfaces/libpq/libpq-fe.h src/interfaces/libpq/libpq-events.h -name '*.h' -print | \ +for f in `cd "$srcdir" && find src/include src/interfaces/libpq/libpq-fe.h src/interfaces/libpq/libpq-events.h -name '*.h' -print | \ grep -v -e ^src/include/port/ \ -e ^src/include/rusagestub.h -e ^src/include/regex/regerrs.h \ -e ^src/include/access/rmgrlist.h \ @@ -36,5 +54,7 @@ do echo '};' } >$tmp/test.cpp - ${CXX:-g++} -I . -I src/interfaces/libpq -I src/include -fsyntax-only -Wall -c $tmp/test.cpp + ${CXX:-g++} -I $srcdir -I $srcdir/src/interfaces/libpq -I $srcdir/src/include \ + -I $builddir -I $builddir/src/interfaces/libpq -I $builddir/src/include \ + -fsyntax-only -Wall -c $tmp/test.cpp done |