mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'dl/cocci-everywhere'
Coccinelle checks are done on more source files than before now. * dl/cocci-everywhere: Makefile: run coccicheck on more source files Makefile: strip leading ./ in $(FIND_SOURCE_FILES) Makefile: define THIRD_PARTY_SOURCES Makefile: strip leading ./ in $(LIB_H)
This commit is contained in:
commit
3f84633563
30
Makefile
30
Makefile
|
@ -598,6 +598,7 @@ SCRIPT_SH =
|
|||
SCRIPT_LIB =
|
||||
TEST_BUILTINS_OBJS =
|
||||
TEST_PROGRAMS_NEED_X =
|
||||
THIRD_PARTY_SOURCES =
|
||||
|
||||
# Having this variable in your environment would break pipelines because
|
||||
# you cause "cd" to echo its destination to stdout. It can also take
|
||||
|
@ -818,12 +819,12 @@ VCSSVN_LIB = vcs-svn/lib.a
|
|||
|
||||
GENERATED_H += command-list.h
|
||||
|
||||
LIB_H := $(sort $(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
|
||||
LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
|
||||
$(FIND) . \
|
||||
-name .git -prune -o \
|
||||
-name t -prune -o \
|
||||
-name Documentation -prune -o \
|
||||
-name '*.h' -print))
|
||||
-name '*.h' -print)))
|
||||
|
||||
LIB_OBJS += abspath.o
|
||||
LIB_OBJS += advice.o
|
||||
|
@ -1146,6 +1147,20 @@ BUILTIN_OBJS += builtin/verify-tag.o
|
|||
BUILTIN_OBJS += builtin/worktree.o
|
||||
BUILTIN_OBJS += builtin/write-tree.o
|
||||
|
||||
# THIRD_PARTY_SOURCES is a list of patterns compatible with the
|
||||
# $(filter) and $(filter-out) family of functions. They specify source
|
||||
# files which are taken from some third-party source where we want to be
|
||||
# less strict about issues such as coding style so we don't diverge from
|
||||
# upstream unnecessarily (making merging in future changes easier).
|
||||
THIRD_PARTY_SOURCES += compat/inet_ntop.c
|
||||
THIRD_PARTY_SOURCES += compat/inet_pton.c
|
||||
THIRD_PARTY_SOURCES += compat/nedmalloc/%
|
||||
THIRD_PARTY_SOURCES += compat/obstack.%
|
||||
THIRD_PARTY_SOURCES += compat/poll/%
|
||||
THIRD_PARTY_SOURCES += compat/regex/%
|
||||
THIRD_PARTY_SOURCES += sha1collisiondetection/%
|
||||
THIRD_PARTY_SOURCES += sha1dc/%
|
||||
|
||||
GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB)
|
||||
EXTLIBS =
|
||||
|
||||
|
@ -2600,6 +2615,7 @@ FIND_SOURCE_FILES = ( \
|
|||
-o \( -name 'trash*' -type d -prune \) \
|
||||
-o \( -name '*.[hcS]' -type f -print \) \
|
||||
-o \( -name '*.sh' -type f -print \) \
|
||||
| sed -e 's|^\./||' \
|
||||
)
|
||||
|
||||
$(ETAGS_TARGET): FORCE
|
||||
|
@ -2769,7 +2785,7 @@ EXCEPT_HDRS := $(GEN_HDRS) compat/% xdiff/%
|
|||
ifndef GCRYPT_SHA256
|
||||
EXCEPT_HDRS += sha256/gcrypt.h
|
||||
endif
|
||||
CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(patsubst ./%,%,$(LIB_H)))
|
||||
CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(LIB_H))
|
||||
HCO = $(patsubst %.h,%.hco,$(CHK_HDRS))
|
||||
|
||||
$(HCO): %.hco: %.h FORCE
|
||||
|
@ -2792,12 +2808,8 @@ check: command-list.h
|
|||
exit 1; \
|
||||
fi
|
||||
|
||||
C_SOURCES = $(patsubst %.o,%.c,$(C_OBJ))
|
||||
ifdef DC_SHA1_SUBMODULE
|
||||
COCCI_SOURCES = $(filter-out sha1collisiondetection/%,$(C_SOURCES))
|
||||
else
|
||||
COCCI_SOURCES = $(filter-out sha1dc/%,$(C_SOURCES))
|
||||
endif
|
||||
FOUND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES)))
|
||||
COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES))
|
||||
|
||||
%.cocci.patch: %.cocci $(COCCI_SOURCES)
|
||||
@echo ' ' SPATCH $<; \
|
||||
|
|
Loading…
Reference in a new issue