espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-12 13:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[style] upgrade clang-format and clang-tidy from 14 to 16 (#11682)

Browse Source
This commit is contained in:
Li Cao
2025-07-10 18:19:26 -07:00
committed by GitHub
parent a9c2001bf1
commit 6c6e99ee7c
24 changed files with 90 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/bootstrap
+9 -9
View File
@@ -38,7 +38,7 @@ install_packages_pretty_format()
echo 'Installing pretty tools useful for code contributions...'
# add clang-format and clang-tidy for pretty
sudo apt-get --no-install-recommends install -y clang-format-14 clang-tidy-14 || echo 'WARNING: could not install clang-format-14 and clang-tidy-14, which is useful if you plan to contribute C/C++ code to the OpenThread project.'
sudo apt-get --no-install-recommends install -y clang-format-16 clang-tidy-16 || echo 'WARNING: could not install clang-format-16 and clang-tidy-16, which is useful if you plan to contribute C/C++ code to the OpenThread project.'
# add yapf for pretty
python3 -m pip install yapf==0.31.0 || echo 'WARNING: could not install yapf, which is useful if you plan to contribute python code to the OpenThread project.'
@@ -113,14 +113,14 @@ install_packages_brew()
echo 'Installing pretty tools useful for code contributions...'
# add clang-format for pretty
CLANG_FORMAT_VERSION="clang-format version 14"
command -v clang-format-14 || (command -v clang-format && (clang-format --version | grep -q "${CLANG_FORMAT_VERSION}")) || {
brew install llvm@14
sudo ln -s "$(brew --prefix llvm@14)/bin/clang-format" /usr/local/bin/clang-format-14
sudo ln -s "$(brew --prefix llvm@14)/bin/clang-tidy" /usr/local/bin/clang-tidy-14
sudo ln -s "$(brew --prefix llvm@14)/bin/clang-apply-replacements" /usr/local/bin/clang-apply-replacements-14
sudo ln -s "$(brew --prefix llvm@14)/bin/run-clang-tidy" /usr/local/bin/run-clang-tidy-14
} || echo 'WARNING: could not install llvm@14, which is useful if you plan to contribute C/C++ code to the OpenThread project.'
CLANG_FORMAT_VERSION="clang-format version 16"
command -v clang-format-16 || (command -v clang-format && (clang-format --version | grep -q "${CLANG_FORMAT_VERSION}")) || {
brew install llvm@16
sudo ln -s "$(brew --prefix llvm@16)/bin/clang-format" /usr/local/bin/clang-format-16
sudo ln -s "$(brew --prefix llvm@16)/bin/clang-tidy" /usr/local/bin/clang-tidy-16
sudo ln -s "$(brew --prefix llvm@16)/bin/clang-apply-replacements" /usr/local/bin/clang-apply-replacements-16
sudo ln -s "$(brew --prefix llvm@16)/bin/run-clang-tidy" /usr/local/bin/run-clang-tidy-16
} || echo 'WARNING: could not install llvm@16, which is useful if you plan to contribute C/C++ code to the OpenThread project.'
# add yapf for pretty
python3 -m pip install yapf || echo 'Failed to install python code formatter yapf. Install it manually if you need.'
script/clang-format
+5 -5
View File
@@ -27,7 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
CLANG_FORMAT_VERSION="clang-format version 14.0"
CLANG_FORMAT_VERSION="clang-format version 16.0"
die()
{
@@ -39,18 +39,18 @@ die()
# expand_aliases shell option is set using shopt.
shopt -s expand_aliases
if command -v clang-format-14 >/dev/null; then
alias clang-format=clang-format-14
if command -v clang-format-16 >/dev/null; then
alias clang-format=clang-format-16
elif command -v clang-format >/dev/null; then
case "$(clang-format --version)" in
*"$CLANG_FORMAT_VERSION"*) ;;
*)
die "$(clang-format --version); clang-format 14.0 required"
die "$(clang-format --version); clang-format 16.0 required"
;;
esac
else
die "clang-format 14.0 required"
die "clang-format 16.0 required"
fi
clang-format "$@" || die
script/clang-tidy
+16 -16
View File
@@ -27,8 +27,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
CLANG_TIDY_VERSION="LLVM version 14.0"
CLANG_APPLY_REPLACEMENTS_VERSION="clang-apply-replacements version 14.0"
CLANG_TIDY_VERSION="LLVM version 16.0"
CLANG_APPLY_REPLACEMENTS_VERSION="clang-apply-replacements version 16.0"
die()
{
@@ -36,9 +36,9 @@ die()
exit 1
}
# Search for clang-tidy-14
if command -v clang-tidy-14 >/dev/null; then
clang_tidy=$(command -v clang-tidy-14)
# Search for clang-tidy-16
if command -v clang-tidy-16 >/dev/null; then
clang_tidy=$(command -v clang-tidy-16)
elif command -v clang-tidy >/dev/null; then
clang_tidy=$(command -v clang-tidy)
case "$($clang_tidy --version)" in
@@ -49,12 +49,12 @@ elif command -v clang-tidy >/dev/null; then
;;
esac
else
die "clang-tidy 14.0 required"
die "clang-tidy 16.0 required"
fi
# Search for clang-apply-replacements-14
if command -v clang-apply-replacements-14 >/dev/null; then
clang_apply_replacements=$(command -v clang-apply-replacements-14)
# Search for clang-apply-replacements-16
if command -v clang-apply-replacements-16 >/dev/null; then
clang_apply_replacements=$(command -v clang-apply-replacements-16)
elif command -v clang-apply-replacements >/dev/null; then
clang_apply_replacements=$(command -v clang-apply-replacements)
case "$($clang_apply_replacements --version)" in
@@ -65,20 +65,20 @@ elif command -v clang-apply-replacements >/dev/null; then
;;
esac
else
die "clang-apply-replacements 14.0 required"
die "clang-apply-replacements 16.0 required"
fi
# Search for run-clang-tidy-14.py
if command -v run-clang-tidy-14.py >/dev/null; then
run_clang_tidy=$(command -v run-clang-tidy-14.py)
elif command -v run-clang-tidy-14 >/dev/null; then
run_clang_tidy=$(command -v run-clang-tidy-14)
# Search for run-clang-tidy-16.py
if command -v run-clang-tidy-16.py >/dev/null; then
run_clang_tidy=$(command -v run-clang-tidy-16.py)
elif command -v run-clang-tidy-16 >/dev/null; then
run_clang_tidy=$(command -v run-clang-tidy-16)
elif command -v run-clang-tidy.py >/dev/null; then
run_clang_tidy=$(command -v run-clang-tidy.py)
elif command -v run-clang-tidy >/dev/null; then
run_clang_tidy=$(command -v run-clang-tidy)
else
die "run-clang-tidy.py 14.0 required"
die "run-clang-tidy.py 16.0 required"
fi
$run_clang_tidy -clang-tidy-binary "$clang_tidy" -clang-apply-replacements-binary "$clang_apply_replacements" "$@" || die