Remove gdb_indent.sh

Message ID 20181229170333.24744-1-tom@tromey.com
State New
Headers show
Series
  • Remove gdb_indent.sh
Related show

Commit Message

Tom Tromey Dec. 29, 2018, 5:03 p.m.
gdb_indent.sh relies on GNU indent, which does not handle C++.  This
patch removes gdb_indent.sh and the (currently disabled) code that
uses it in update-web-ari.sh.

I've looked into using clang-format to indent gdb, but I think it is
unsuitable.  The way it reformats argument lists is truly ugly at
times.

gdb/ChangeLog
2018-12-29  Tom Tromey  <tom@tromey.com>

	* contrib/ari/update-web-ari.sh: Remove indent code.
	* gdb_indent.sh: Remove.
---
 gdb/ChangeLog                     |  5 ++
 gdb/contrib/ari/update-web-ari.sh | 20 +------
 gdb/gdb_indent.sh                 | 92 -------------------------------
 3 files changed, 6 insertions(+), 111 deletions(-)
 delete mode 100755 gdb/gdb_indent.sh

-- 
2.17.2

Patch

diff --git a/gdb/contrib/ari/update-web-ari.sh b/gdb/contrib/ari/update-web-ari.sh
index 4356f6bb58..35e58adbe5 100644
--- a/gdb/contrib/ari/update-web-ari.sh
+++ b/gdb/contrib/ari/update-web-ari.sh
@@ -64,13 +64,12 @@  fi
 # ari.*.bug: <FILE>:<LINE>: <CATEGORY>: <BUG>: <DOC>
 # ari.*.idx: <BUG>:<FILE>:<CATEGORY>
 # ari.*.doc: <BUG>:<COUNT>:<CATEGORY>:<DOC>
-# Where ``*'' is {source,warning,indent,doschk}
+# Where ``*'' is {source,warning,doschk}
 
 unpack_source_p=true
 delete_source_p=true
 
 check_warning_p=false # broken
-check_indent_p=false # too slow, too many fail
 check_source_p=true
 check_doschk_p=true
 check_werror_p=true
@@ -173,23 +172,6 @@  END {
 ' > ${root}/ari.warning.bug
 fi
 
-# THIS HAS SUFFERED BIT ROT
-if ${check_indent_p} && test -d "${srcdir}"
-then
-    printf "Analizing file indentation:" 1>&2
-    ( cd "${srcdir}" && /bin/sh ${aridir}/gdb_find.sh ${project} | while read f
-    do
-	if /bin/sh ${aridir}/gdb_indent.sh < ${f} 2>/dev/null | cmp -s - ${f}
-	then
-	    :
-	else
-	    # ari.*.bug: <FILE>:<LINE>: <CATEGORY>: <BUG>: <DOC>
-	    echo "${f}:0: info: indent: Indentation does not match GNU indent output"
-	fi
-    done ) > ${wwwdir}/ari.indent.bug
-    echo ""
-fi
-
 if ${check_source_p} && test -d "${srcdir}"
 then
     bugf=${wwwdir}/ari.source.bug
diff --git a/gdb/gdb_indent.sh b/gdb/gdb_indent.sh
deleted file mode 100755
index 115b99521f..0000000000
--- a/gdb/gdb_indent.sh
+++ /dev/null
@@ -1,92 +0,0 @@ 
-#!/bin/sh
-
-# Try to find a GNU indent.  There could be a BSD indent in front of a
-# GNU gindent so when indent is found, keep looking.
-
-# Make certain that the script is not running in an internationalized
-# environment.
-LANG=c ; export LANG
-LC_ALL=c ; export LC_ALL
-
-gindent=
-indent=
-paths=`echo $PATH | sed \
-	-e 's/::/:.:/g' \
-	-e 's/^:/.:/' \
-	-e 's/:$/:./' \
-	-e 's/:/ /g'`
-for path in $paths
-do
-    if test ! -n "${gindent}" -a -x ${path}/gindent
-    then
-	gindent=${path}/gindent
-	break
-    elif test ! -n "${indent}" -a -x ${path}/indent
-    then
-	indent=${path}/indent
-    fi
-done
-
-if test -n "${gindent}"
-then
-    indent=${gindent}
-elif test -n "${indent}"
-then
-    :
-else
-    echo "Indent not found" 1>&2
-fi
-
-
-# Check that the indent found is both GNU and a reasonable version.
-# Different indent versions give different indentation.
-
-m1=2
-m2=2
-m3=9
-
-version=`${indent} --version 2>/dev/null < /dev/null`
-case "${version}" in
-    *GNU* ) ;;
-    * ) echo "error: GNU indent $m1.$m2.$m3 expected" 1>&2 ; exit 1;;
-esac
-v1=`echo "${version}" | sed 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\1/'`
-v2=`echo "${version}" | sed 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\2/'`
-v3=`echo "${version}" | sed 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\3/'`
-
-if test $m1 -ne $v1 -o $m2 -ne $v2 -o $m3 -gt $v3
-then
-    echo "error: Must be GNU indent version $m1.$m2.$m3 or later" 1>&2
-    exit 1
-fi
-
-if test $m3 -ne $v3
-then
-    echo "warning: GNU indent version $m1.$m2.$m3 recommended" 1>&2
-fi
-
-# Check that we're in the GDB source directory
-
-case `pwd` in
-    */gdb ) ;;
-    */sim/* ) ;;
-    * ) echo "Not in GDB directory" 1>&2 ; exit 1 ;;
-esac
-
-
-# Run indent per GDB specs
-
-types="\
--T FILE \
--T bfd -T asection -T pid_t \
--T prgregset_t -T fpregset_t -T gregset_t -T sigset_t \
--T td_thrhandle_t -T td_event_msg_t -T td_thr_events_t \
--T td_notify_t -T td_thr_iter_f -T td_thrinfo_t \
--T caddr_t \
-`cat *.h | sed -n \
-    -e 's/^.*[^a-z0-9_]\([a-z0-9_]*_ftype\).*$/-T \1/p' \
-    -e 's/^.*[^a-z0-9_]\([a-z0-9_]*_func\).*$/-T \1/p' \
-    -e 's/^typedef.*[^a-zA-Z0-9_]\([a-zA-Z0-9_]*[a-zA-Z0-9_]\);$/-T \1/p' \
-    | sort -u`"
-
-${indent} ${types} "$@"