colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: fix out-of-tree build test "tools/check-docs.sh" for duplicate generated sources

Browse Source 
When we do an in-tree-build with autotools and an out-of-tree build
with meson (all in the same source directory), then we have the
following files:

  libnm-core/nm-core-enum-types.h
  libnm/nm-enum-types.h
  build/libnm-core/nm-core-enum-types.h
  build/libnm/nm-enum-types.h

This caused "tools/check-docs.sh" for `ninja -C build test` to fail,
because the files are detected twice:

    --- command ---
    /data/src/NetworkManager/tools/check-docs.sh /data/src/NetworkManager /data/src/NetworkManager/build
    --- stderr ---
    8a9
    > nm-core-enum-types
    38a40
    > nm-enum-types
    *** Error: libnm classes not included in docs/libnm/libnm-docs.xml ***
    -------
This commit is contained in:
Thomas Haller
2019-04-23 11:33:47 +02:00
parent a9b4362fc5
commit 17adf58d5d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/check-docs.sh
View File

@@ -23,7 +23,13 @@ same_lines() {
libnm_headers() {
(
ls -1 "$1/libnm"/*.h "$1/libnm-core"/*.h
ls -1 "$1/libnm"/*.h "$1/libnm-core"/*.h | \
if [ -n "$2" ]; then
grep -v -F "$1/libnm-core/nm-core-enum-types.h" | \
grep -v -F "$1/libnm/nm-enum-types.h"
else
cat
fi
if [ -n "$2" ]; then
ls -1 "$2/libnm"/*.h "$2/libnm-core"/*.h
fi