echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clang-format.bash: update to clang-format-18

Browse Source 
The `.clang-format` configuration needs no changes to make the
version 18 format close to what version 15 produced before.

Issue: #26123
This commit is contained in:
Brad King 2025-01-23 11:38:03 -05:00
parent 17255e48af
commit e641442149
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -1,5 +1,5 @@
--- ---
# This configuration requires clang-format version 15 exactly. # This configuration requires clang-format version 18 exactly.
BasedOnStyle: Mozilla BasedOnStyle: Mozilla
AlignOperands: false AlignOperands: false
AllowShortFunctionsOnASingleLine: InlineOnly AllowShortFunctionsOnASingleLine: InlineOnly

2
.gitattributes vendored
View File

@ -4,7 +4,7 @@
.editorconfig export-ignore .editorconfig export-ignore
# Custom attribute to mark sources as using our C code style. # Custom attribute to mark sources as using our C code style.
[attr]our-c-style whitespace=tab-in-indent format.clang-format=15 [attr]our-c-style whitespace=tab-in-indent format.clang-format=18
# Custom attribute to mark sources as generated. # Custom attribute to mark sources as generated.
# Do not perform whitespace checks. Do not format. # Do not perform whitespace checks. Do not format.

2
Help/dev/source.rst
View File

@ -9,7 +9,7 @@ See documentation on `CMake Development`_ for more information.
C++ Code Style C++ Code Style
============== ==============
We use `clang-format`_ version **15** to define our style for C++ code in We use `clang-format`_ version **18** to define our style for C++ code in
the CMake source tree. See the `.clang-format`_ configuration file for our the CMake source tree. See the `.clang-format`_ configuration file for our
style settings. Use the `Utilities/Scripts/clang-format.bash`_ script to style settings. Use the `Utilities/Scripts/clang-format.bash`_ script to
format source code. It automatically runs ``clang-format`` on the set of format source code. It automatically runs ``clang-format`` on the set of

2
Utilities/.gitattributes vendored
View File

@ -5,4 +5,4 @@ SetupForDevelopment.sh export-ignore
# Do not format third-party sources. # Do not format third-party sources.
/KWIML/** -format.clang-format /KWIML/** -format.clang-format
/cm*/** -format.clang-format /cm*/** -format.clang-format
/cmcurl/curltest.c format.clang-format=15 /cmcurl/curltest.c format.clang-format=18

8
Utilities/Scripts/clang-format.bash
View File

@ -78,7 +78,7 @@ test "$#" = 0 || die "$usage"
# Find a default tool. # Find a default tool.
tools=' tools='
clang-format-15 clang-format-18
clang-format clang-format
' '
if test "x$clang_format" = "x"; then if test "x$clang_format" = "x"; then
@ -96,8 +96,8 @@ if ! type -p "$clang_format" >/dev/null; then
exit 1 exit 1
fi fi
if ! "$clang_format" --version | grep 'clang-format version 15' >/dev/null 2>/dev/null; then if ! "$clang_format" --version | grep 'clang-format version 18' >/dev/null 2>/dev/null; then
echo "clang-format version 15 is required (exactly)" echo "clang-format version 18 is required (exactly)"
exit 1 exit 1
fi fi
@ -116,7 +116,7 @@ $git_ls |
# Select sources with our attribute. # Select sources with our attribute.
git check-attr --stdin format.clang-format | git check-attr --stdin format.clang-format |
sed -n '/: format\.clang-format: \(set\|15\)$/ {s/:[^:]*:[^:]*$//p}' | sed -n '/: format\.clang-format: \(set\|18\)$/ {s/:[^:]*:[^:]*$//p}' |
# Update sources in-place. # Update sources in-place.
xargs -d '\n' "$clang_format" -i xargs -d '\n' "$clang_format" -i