diff --git a/tools/check-format b/tools/check-format index 291d1523e27767aee15a04ba504ea968570f44ed..005c77c1ecfef05fc891dbb6ffc2d3c90a2a6912 100755 --- a/tools/check-format +++ b/tools/check-format @@ -41,7 +41,7 @@ fi cd "${ROOTDIR}" # Note that the --dry-run and --Werror clang-format arguments require # clang-format 10 or higher. See https://reviews.llvm.org/D68554 -find . \( -path '*/\.*' -o -path "./build*" \) -prune -o \ +find . \( -path '*/\.*' -o -path "./subprojects*" -o -path "./build*" \) -prune -o \ -type f -regextype posix-extended -regex '.*\.(c|h|cpp|hpp)' -print0 |\ tee "${CHECKED_FILES_FILE}" |\ xargs --null --max-args=3 --max-procs="${MAX_PROCS}" \ diff --git a/tools/check-license b/tools/check-license index f77900e277629d5a192f78a9aecc57feeac42573..d6e3ad1220a53a27ed8cd765f1788c2d4c22275e 100755 --- a/tools/check-license +++ b/tools/check-license @@ -77,7 +77,7 @@ MAX_PROCS=$(nproc) cd "${ROOTDIR}" set +e -find . \( -path '*/\.*' -o -path "./build*" -o -path "./test/3rd-party*" \) -prune -o \ +find . \( -path '*/\.*' -o -path './subprojects*' -o -path "./build*" -o -path "./test/3rd-party*" \) -prune -o \ -type f -regextype posix-extended -regex '.*\.(c|h|cpp|hpp)' -print0 |\ xargs --null --max-args=1 --max-procs="${MAX_PROCS}" -I {} \ bash -c 'check_license "$@"' _ "{}" @@ -98,7 +98,7 @@ if [[ $CHECK_RETURN_VALUE -ne 0 ]]; then cat <<EOF > "${TMPFILE}" // SPDX-License-Identifier: LGPL-3.0-or-later -// Copyright © 2020 Florian Schmaus +// Copyright © $(date +%Y) $(git config user.name) EOF cat "${INVALID_LICENSE_FILE}" >> "${TMPFILE}" mv "${TMPFILE}" "${INVALID_LICENSE_FILE}"