As no-one else wanted to do so - I now moved the tags support
to a shell script of its own.
The usage is the same: make {tags,TAGS,cscope}
The ALLSOURCE_ARCHS suppport was lost in the transition - is it actually used by anyone?
I have given the patch only some light testing.
Could those of you that actually sues tags/cscope plese give it a try.
My naive transformation to a shell script could benefit from
a pair of critical eyes too.
I will await feedback on the script and ALLSOURCE_ARCHS
before I push it out.
Sam
>From b6083161ff0a4d4c2a8946c1b4fec7a23fce55a8 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date: Sun, 23 Nov 2008 00:02:49 +0100
Subject: [PATCH] kbuild: move tags support to a shell script
tags and cscope support really belongs in a shell script
as they do not benefit from the make functionality.
Moving the support to a shell script has several benefits:
- The code is much easier to read
- More people is able to extend the tags support
- We see less changes to the top-level Makefile
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
---
Makefile | 118 +-------------------------------------------
scripts/tags.sh | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 148 insertions(+), 116 deletions(-)
create mode 100644 scripts/tags.sh
diff --git a/scripts/tags.sh b/scripts/tags.sh
new file mode 100644
index 0000000..5cbc95e
--- /dev/null
+++ b/scripts/tags.sh
@@ -0,0 +1,146 @@
+#!/bin/sh
+# Generate tags or cscope files
+# Usage tags.sh <mode>
+#
+# mode may be any of: tags, TAGS, cscope
+#
+# Uses the following environment variables:
+# ARCH, SUBARCH, srctree, src, obj
+
+# This is a duplicate of RCS_FIND_IGNORE without escaped '()'
+ignore="( -name SCCS -o -name BitKeeper -o -name .svn -o \
+ -name CVS -o -name .pc -o -name .hg -o \
+ -name .git ) \
+ -prune -o"
+
+# find sources in arch/$ARCH
+find_arch_sources()
+{
+ find ${__srctree}arch/$1 $ignore \
+ -wholename ${__srctree}arch/$1/include -type d -prune \
+ -o -name $2 -print;
+}
+
+# find sources in:
+# include/asm-$ARCH
+# arch/$ARCH/include
+find_arch_include_sources()
+{
+ test -e ${__srctree}include/asm-$1 && \
+ find ${__srctree}include/asm-$1 $ignore \
+ -name $2 -print;
+ test -e ${__srctree}include/asm && \
+ find ${__srctree}arch/$1/include/asm $ignore \
+ -name $2 -print;
+}
+
+find_include_sources()
+{
+ find ${__srctree}security/selinux/include $ignore \
+ -name $1 -print;
+
+ find ${__srctree}include $ignore \
+ \( -name config -o -name 'asm-*' \) -prune \
+ -o -name $1 -print; \
+
+ find ${__srctree}include/asm-generic $ignore \
+ -name $1 -print;
+}
+
+find_other_sources()
+{
+ find ${__srctree}* $ignore \
+ \( -name include -o -name arch -o -name '.tmp_*' \) -prune -o \
+ -name $1 -print;
+}
+
+find_sources()
+{
+ for arch in $1; do
+ find_arch_sources $arch $2
+ find_arch_include_sources $arch "$2"
+ done
+
+ find_include_sources "$2"
+ find_other_sources "$2"
+}
+
+all_sources()
+{
+ find_sources "${archs}" *.[chS]
+}
+
+all_kconfigs()
+{
+ find_sources "${archs}" "Kconfig*"
+}
+
+all_defconfigs()
+{
+ find_sources "${archs}" "defconfig"
+}
+
+docscope()
+{
+ (echo \-k; echo \-q; all_sources) > cscope.files
+ echo " GEN cscope.out (from $(wc -l cscope.files | cut -d ' ' -f 1) files)"
+ cscope -b -f cscope.out
+}
+
+xtags()
+{
+ if $1 --version 2>&1 | grep -iq exuberant; then
+ all_sources | xargs $1 -a \
+ -I __initdata,__exitdata,__acquires,__releases \
+ -I __read_mostly,____cacheline_aligned \
+ -I ____cacheline_aligned_in_smp \
+ -I ____cacheline_internodealigned_in_smp \
+ -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \
+ --extra=+f --c-kinds=+px \
+ --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'
+ all_kconfigs | xargs $1 -a \
+ --langdef=kconfig --language-force=kconfig \
+ --regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/\2/'; \
+ all_defconfigs | xargs -r $1 -a \
+ --langdef=dotconfig --language-force=dotconfig \
+ --regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/';
+ elif $1 --version 2>&1 | grep -iq emacs; then
+ all_sources | xargs $1 -a;
+ all_kconfigs | xargs $1 -a \
+ --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/';
+ all_defconfigs | xargs -r $1 -a \
+ --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/';
+ else
+ all_sources | xargs $1 -a;
+ fi
+}
+
+
+# Do not use full path is we do not use O=.. builds
+if [ ${src} == ${obj} ]; then
+ x__srctree=
+else
+ x__srctree=${srctree}
+fi
+
+# Support um (which has SUBARCH)
+# FIXME: add support for ALLSOURCE_ARCHS if really used
+if [ "${ARCH}" == "${SUBARCH}" ]; then
+ archs="${ARCH} ${SUBARCH}"
+else
+ archs="${SRCARCH}"
+fi
+
+case "$1" in
+ "cscope")
+ docscope
+ ;;
+
+ "tags")
+ xtags ctags
+ ;;
+
+ "TAGS")
+ xtags etags
+ ;;
+esac
diff --git a/Makefile b/Makefile
index 391b2da..3e6cb2b 100644
--- a/Makefile
+++ b/Makefile
@@ -1409,122 +1409,8 @@ endif # KBUILD_EXTMOD
# Generate tags for editors
# ---------------------------------------------------------------------------
-
-#We want __srctree to totally vanish out when KBUILD_OUTPUT is not set
-#(which is the most common case IMHO) to avoid unneeded clutter in the big tags file.
-#Adding $(srctree) adds about 20M on i386 to the size of the output file!
-
-ifeq ($(src),$(obj))
-__srctree =
-else
-__srctree = $(srctree)/
-endif
-
-ifeq ($(ALLSOURCE_ARCHS),)
-ifeq ($(ARCH),um)
-ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH)
-else
-ALLINCLUDE_ARCHS := $(SRCARCH)
-endif
-else
-#Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behaviour.
-ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
-endif
-
-ALLSOURCE_ARCHS := $(SRCARCH)
-
-define find-sources
- ( for arch in $(ALLSOURCE_ARCHS) ; do \
- find $(__srctree)arch/$${arch} $(RCS_FIND_IGNORE) \
- -wholename $(__srctree)arch/$${arch}/include/asm -type d -prune \
- -o -name $1 -print; \
- done ; \
- find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \
- -name $1 -print; \
- find $(__srctree)include $(RCS_FIND_IGNORE) \
- \( -name config -o -name 'asm-*' \) -prune \
- -o -name $1 -print; \
- for arch in $(ALLINCLUDE_ARCHS) ; do \
- test -e $(__srctree)include/asm-$${arch} && \
- find $(__srctree)include/asm-$${arch} $(RCS_FIND_IGNORE) \
- -name $1 -print; \
- test -e $(__srctree)arch/$${arch}/include/asm && \
- find $(__srctree)arch/$${arch}/include/asm $(RCS_FIND_IGNORE) \
- -name $1 -print; \
- done ; \
- find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \
- -name $1 -print; \
- find $(__srctree) $(RCS_FIND_IGNORE) \
- \( -name include -o -name arch -o -name '.tmp_*' \) -prune -o \
- -name $1 -print; \
- )
-endef
-
-define all-sources
- $(call find-sources,'*.[chS]')
-endef
-define all-kconfigs
- $(call find-sources,'Kconfig*')
-endef
-define all-defconfigs
- $(call find-sources,'defconfig')
-endef
-
-define xtags
- if $1 --version 2>&1 | grep -iq exuberant; then \
- $(all-sources) | xargs $1 -a \
- -I __initdata,__exitdata,__acquires,__releases \
- -I __read_mostly,____cacheline_aligned,____cacheline_aligned_in_smp,____cacheline_internodealigned_in_smp \
- -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \
- --extra=+f --c-kinds=+px \
- --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'; \
- $(all-kconfigs) | xargs $1 -a \
- --langdef=kconfig \
- --language-force=kconfig \
- --regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/\2/'; \
- $(all-defconfigs) | xargs -r $1 -a \
- --langdef=dotconfig \
- --language-force=dotconfig \
- --regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'; \
- elif $1 --version 2>&1 | grep -iq emacs; then \
- $(all-sources) | xargs $1 -a; \
- $(all-kconfigs) | xargs $1 -a \
- --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'; \
- $(all-defconfigs) | xargs -r $1 -a \
- --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
- else \
- $(all-sources) | xargs $1 -a; \
- fi
-endef
-
-quiet_cmd_cscope-file = FILELST cscope.files
- cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files
-
-quiet_cmd_cscope = MAKE cscope.out
- cmd_cscope = cscope -b -f cscope.out
-
-cscope: FORCE
- $(call cmd,cscope-file)
- $(call cmd,cscope)
-
-quiet_cmd_TAGS = MAKE $@
-define cmd_TAGS
- rm -f $@; \
- $(call xtags,etags)
-endef
-
-TAGS: FORCE
- $(call cmd,TAGS)
-
-quiet_cmd_tags = MAKE $@
-define cmd_tags
- rm -f $@; \
- $(call xtags,ctags)
-endef
-
-tags: FORCE
- $(call cmd,tags)
-
+tags TAGS cscope: FORCE
+ $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
# Scripts to check various things for consistency
# ---------------------------------------------------------------------------
--
1.5.6.GIT
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
