From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 22:45:37 +0000 (-0800)
Subject: Merge branch 'jk/make-tags-find-sources-tweak'
X-Git-Tag: v2.12.0-rc0~124
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/09b4fdb5f396612dd50236ae5395a74600d2ab84?ds=sidebyside;hp=-c

Merge branch 'jk/make-tags-find-sources-tweak'

Update the procedure to generate "tags" for developer support.

* jk/make-tags-find-sources-tweak:
Makefile: exclude contrib from FIND_SOURCE_FILES
Makefile: match shell scripts in FIND_SOURCE_FILES
Makefile: exclude test cruft from FIND_SOURCE_FILES
Makefile: reformat FIND_SOURCE_FILES
---

09b4fdb5f396612dd50236ae5395a74600d2ab84
diff --combined Makefile
index f61076997a,76267262c1..05a35ad3b5
--- a/Makefile
+++ b/Makefile
@@@ -338,6 -338,11 +338,6 @@@ all:
  #
  # Define NATIVE_CRLF if your platform uses CRLF for line endings.
  #
 -# Define XDL_FAST_HASH to use an alternative line-hashing method in
 -# the diff algorithm.  It gives a nice speedup if your processor has
 -# fast unaligned word loads.  Does NOT work on big-endian systems!
 -# Enabled by default on x86_64.
 -#
  # Define GIT_USER_AGENT if you want to change how git identifies itself during
  # network interactions.  The default is "git/$(GIT_VERSION)".
  #
@@@ -1480,6 -1485,10 +1480,6 @@@ ifndef NO_MSGFMT_EXTENDED_OPTION
  	MSGFMT += --check --statistics
  endif
  
 -ifneq (,$(XDL_FAST_HASH))
 -	BASIC_CFLAGS += -DXDL_FAST_HASH
 -endif
 -
  ifdef GMTIME_UNRELIABLE_ERRORS
  	COMPAT_OBJS += compat/gmtime.o
  	BASIC_CFLAGS += -DGMTIME_UNRELIABLE_ERRORS
@@@ -2140,9 -2149,22 +2140,22 @@@ endi
  po/build/locale/%/LC_MESSAGES/git.mo: po/%.po
  	$(QUIET_MSGFMT)mkdir -p $(dir $@) && $(MSGFMT) -o $@ $<
  
- FIND_SOURCE_FILES = ( git ls-files '*.[hcS]' 2>/dev/null || \
- 			$(FIND) . \( -name .git -type d -prune \) \
- 				-o \( -name '*.[hcS]' -type f -print \) )
+ FIND_SOURCE_FILES = ( \
+ 	git ls-files \
+ 		'*.[hcS]' \
+ 		'*.sh' \
+ 		':!*[tp][0-9][0-9][0-9][0-9]*' \
+ 		':!contrib' \
+ 		2>/dev/null || \
+ 	$(FIND) . \
+ 		\( -name .git -type d -prune \) \
+ 		-o \( -name '[tp][0-9][0-9][0-9][0-9]*' -prune \) \
+ 		-o \( -name contrib -type d -prune \) \
+ 		-o \( -name build -type d -prune \) \
+ 		-o \( -name 'trash*' -type d -prune \) \
+ 		-o \( -name '*.[hcS]' -type f -print \) \
+ 		-o \( -name '*.sh' -type f -print \) \
+ 	)
  
  $(ETAGS_TARGET): FORCE
  	$(RM) $(ETAGS_TARGET)