Base the implementation on the llvmdo script so that we only have to

maintain the logic for "what counts as a source file" in one place.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16442 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 11 insertions, 38 deletions

diff --git a/utils/countloc.sh b/utils/countloc.sh
index 75a6154971..cc67afe033 100755
--- a/utils/countloc.sh
+++ b/utils/countloc.sh
@@ -15,22 +15,10 @@
 # The script takes no arguments but does expect to be run from the top llvm
 # source directory.
 #
-TOPDIR=`pwd | sed -e 's#(.*/llvm).*#$1#'`
+TOPDIR=`pwd | sed -e 's#\(.*/llvm\).*#\1#'`
 if test -d "$TOPDIR" ; then
   cd $TOPDIR
-  find include lib tools utils examples -type f -name '*.[cdhyltp]*' \
-      \! -name '*~' \
-      \! -name '#*' \
-      \! -name '*.ll' \
-      \! -name '*.lo' \
-      \! -name '*.d' \
-      \! -name '*.dir' \
-      \! -name 'Sparc.burm.c' \
-      \! -name 'llvmAsmParser.cpp' \
-      \! -name 'llvmAsmParser.h' \
-      \! -name 'FileParser.cpp' \
-      \! -name 'FileParser.h' \
-      -exec wc -l {} \; | awk '\
+  ./utils/llvmdo -dirs "include lib tools test utils examples" wc -l | awk '\
       BEGIN { loc=0; } \
       { loc += $1; } \
       END { print loc; }'
diff --git a/utils/getsrcs.sh b/utils/getsrcs.sh
index 210c6980de..2b2f7089e5 100755
--- a/utils/getsrcs.sh
+++ b/utils/getsrcs.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 # This is useful because it prints out all of the source files.  Useful for
 # greps.
-find docs include lib tools utils examples projects -name \*.\[cdhylt\]\* | grep -v Lexer.cpp | \
-       grep -v llvmAsmParser.cpp | grep -v llvmAsmParser.h | grep -v '~$' | \
-       grep -v '\.ll$' | grep -v .flc | grep -v Sparc.burm.c | grep -v '\.d$' |\
-       grep -v '\.dir$' | grep -v '\.la$' | \
-       grep -v /Burg/ | grep -v '\.lo' | grep -v '\.inc$' | grep -v '\.libs' | \
-       grep -v TableGen/FileParser.cpp | grep -v TableGen/FileParser.h
-
+TOPDIR=`pwd | sed -e 's#\(.*/llvm\).*#\1#'`
+if test -d "$TOPDIR" ; then
+  cd $TOPDIR
+  ./utils/llvmdo -dirs "include lib tools utils examples projects" echo
+else
+  echo "Can't find LLVM top directory in $TOPDIR"
+fi
diff --git a/utils/llvmgrep b/utils/llvmgrep
index 8a26044372..18af4346e7 100755
--- a/utils/llvmgrep
+++ b/utils/llvmgrep
@@ -1,25 +1,10 @@
 #!/bin/sh
 # This is useful because it prints out all of the source files.  Useful for
 # greps.
-PATTERN="$*"
-TOPDIR=`pwd | sed -e 's#(.*/llvm).*#$1#'`
+TOPDIR=`pwd | sed -e 's#\(.*/llvm\).*#\1#'`
 if test -d "$TOPDIR" ; then
   cd $TOPDIR
-  find docs include lib tools utils examples projects -type f \
-      \( -path '*/doxygen/*' -o -path '*/Burg/*' \) -prune -o \
-      -name '*.[cdhylt]*' \
-      \! -name '*~' \
-      \! -name '#*' \
-      \! -name '*.ll' \
-      \! -name '*.lo' \
-      \! -name '*.d' \
-      \! -name '*.dir' \
-      \! -name 'Sparc.burm.c' \
-      \! -name 'llvmAsmParser.cpp' \
-      \! -name 'llvmAsmParser.h' \
-      \! -name 'FileParser.cpp' \
-      \! -name 'FileParser.h' \
-      -exec egrep -H -n "$PATTERN" {} \;
+  ./utils/llvmdo -dirs "include lib tools utils docs examples test projects" egrep -H -n "$*"
 else
   echo "Can't find LLVM top directory in $TOPDIR"
 fi