ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checkstyle: add clang-format dependency, fix bug

Browse Source 
Change-Id: I608d3b73700d57652b015a9fc09300e99386a37f
Signed-off-by: Klement Sekera <ksekera@cisco.com>
This commit is contained in:
Klement Sekera
2017-10-04 06:26:36 +02:00
committed by Damjan Marion
parent d867a7cf6b
commit 6b6bd9d0b2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -61,7 +61,7 @@ endif
DEB_DEPENDS = curl build-essential autoconf automake bison ccache DEB_DEPENDS = curl build-essential autoconf automake bison ccache
DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
DEB_DEPENDS += lcov chrpath autoconf nasm indent libnuma-dev DEB_DEPENDS += lcov chrpath autoconf nasm indent clang-format libnuma-dev
DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
ifeq ($(OS_VERSION_ID),14.04) ifeq ($(OS_VERSION_ID),14.04)
DEB_DEPENDS += openjdk-8-jdk-headless DEB_DEPENDS += openjdk-8-jdk-headless

2
build-root/scripts/checkstyle.sh
View File

@ -39,8 +39,8 @@ indent --version
# Check to make sure we have clang-format. Exit if we don't with an error message, but # Check to make sure we have clang-format. Exit if we don't with an error message, but
# don't *fail*. # don't *fail*.
command -v clang-format > /dev/null
HAVE_CLANG_FORMAT=0 HAVE_CLANG_FORMAT=0
command -v clang-format > /dev/null
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "Could not find command \"clang-format\". Checking C++ files will cause abort" echo "Could not find command \"clang-format\". Checking C++ files will cause abort"
else else