CXX-3198 support clang-format-all.sh on macOS
#1307
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
To permit non-default clang-format.
eramongodb
approved these changes
Dec 30, 2024
etc/clang-format-all.sh
Outdated
Comment on lines
15
to
16
| CLANG_FORMAT="${CLANG_FORMAT:-clang-format}" | ||
| "$CLANG_FORMAT" --version |
There was a problem hiding this comment.
Suggested change
| CLANG_FORMAT="${CLANG_FORMAT:-clang-format}" | |
| "$CLANG_FORMAT" --version | |
| clang_format_binary="${CLANG_FORMAT_BINARY:-clang-format}" | |
| "${clang_format_binary:?}" --version |
For consistency with DOXYGEN_BINARY, POETRY_PYTHON_BINARY (C Driver), etc. + recommend using separate variables for input env var (UPPER_CASE) and local variable (snake_case) + use ${clang_format_binary:?} to ensure not-null, not-empty when used below (e.g. catch typoes, etc.).
| @@ -21,11 +22,11 @@ source_dirs=( | |||
| ) | |||
|
|
|||
| mapfile -t source_files < <( | |||
| find "${source_dirs[@]:?}" -regextype posix-egrep -regex '.*\.(hpp|hh|cpp)' | |||
| find "${source_dirs[@]:?}" | grep -E '.*\.(hpp|hh|cpp)$' | |||
There was a problem hiding this comment.
Although I would prefer to use PCRE (-P) for consistency, IIRC it is not fully supported across all distros/versions, so I am fine with using -E here for now.
There was a problem hiding this comment.
Unfortunately -P does not appear supported on macOS grep:
% grep -P
grep: invalid option -- P
usage: grep [-abcdDEFGHhIiJLlMmnOopqRSsUVvwXxZz] [-A num] [-B num] [-C[num]]
[-e pattern] [-f file] [--binary-files=value] [--color=when]
[--context[=num]] [--directories=action] [--label] [--line-buffered]
[--null] [pattern] [file ...]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow-up to #1299. Verified with this patch build.
Use
grepinstead of-regextypeto fix observed error runningetc/clang-format-all.shon macOS:Also allow overriding the used
clang-format. This is intended to ease my current set-up and can be reverted if desired. I installed LLVM 1.19 withbrew install llvm, and it is not on a system path to avoid interfering with AppleClang.