Travis CI: Integrate clang-format 9

This commit is contained in:
Sebastian Pipping 2019-07-24 20:48:55 +02:00
parent 51ba984bb3
commit 090b1cbdef
3 changed files with 55 additions and 0 deletions

View File

@ -58,6 +58,9 @@ elif [[ ${MODE} = cmake-oos ]]; then
find ROOT -printf "%P\n" | sort find ROOT -printf "%P\n" | sort
elif [[ ${MODE} = cppcheck ]]; then elif [[ ${MODE} = cppcheck ]]; then
cppcheck --quiet --error-exitcode=1 . cppcheck --quiet --error-exitcode=1 .
elif [[ ${MODE} = clang-format ]]; then
./apply-clang-format.sh
git diff --exit-code
else else
./qa.sh ${CONFIGURE_ARGS} ./qa.sh ${CONFIGURE_ARGS}
fi fi

View File

@ -21,6 +21,8 @@ env:
matrix: matrix:
include: include:
- os: linux
env: MODE=clang-format
- os: linux - os: linux
env: MODE=cmake-oos CMAKE_ARGS=-DXML_ATTR_INFO=ON env: MODE=cmake-oos CMAKE_ARGS=-DXML_ATTR_INFO=ON
- os: linux - os: linux
@ -46,6 +48,7 @@ addons:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- clang-9 - clang-9
- clang-format-9
- cmake - cmake
- cppcheck - cppcheck
- docbook2x - docbook2x

49
expat/apply-clang-format.sh Executable file
View File

@ -0,0 +1,49 @@
#! /usr/bin/env bash
# __ __ _
# ___\ \/ /_ __ __ _| |_
# / _ \\ /| '_ \ / _` | __|
# | __// \| |_) | (_| | |_
# \___/_/\_\ .__/ \__,_|\__|
# |_| XML parser
#
# Copyright (c) 2019 Expat development team
# Licensed under the MIT license:
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to permit
# persons to whom the Software is furnished to do so, subject to the
# following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
# USE OR OTHER DEALINGS IN THE SOFTWARE.
set -e
set -u
set -o pipefail
find \
-name '*.[ch]' \
-o -name '*.cpp' \
-o -name '*.cxx' \
-o -name '*.h.cmake' \
| sort \
| xargs clang-format -i -style=file -verbose
dos2unix expat_config.h.cmake
sed \
-e 's, @$,@,' \
-e 's,#\( \+\)cmakedefine,\1#cmakedefine,' \
-i \
expat_config.h.cmake
unix2dos expat_config.h.cmake