1
0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00

Modify pgindent to use an external typedefs file rather than included

list.

Remove pgjindent.
This commit is contained in:
Bruce Momjian 2007-12-21 14:20:36 +00:00
parent 3f7f9f594b
commit 7b009a2a9d
4 changed files with 19 additions and 2048 deletions

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# $PostgreSQL: pgsql/src/tools/find_typedef,v 1.6 2006/03/11 04:38:41 momjian Exp $ # $PostgreSQL: pgsql/src/tools/find_typedef,v 1.7 2007/12/21 14:20:36 momjian Exp $
# This script attempts to find all typedef's in the postgres binaries # This script attempts to find all typedef's in the postgres binaries
# by using 'nm' to report all typedef debugging symbols. # by using 'nm' to report all typedef debugging symbols.
@ -33,5 +33,4 @@ sort |
uniq | uniq |
# these are used both for typedefs and variable names # these are used both for typedefs and variable names
# so do not include them # so do not include them
egrep -v '^(date|interval|timestamp|ANY)$' | egrep -v '^(date|interval|timestamp|ANY)$'
sed 's/\(.*\)/-T\1 \\/'

View File

@ -7,22 +7,20 @@ To use pgindent:
2) Install to /usr/local/pgsql 2) Install to /usr/local/pgsql
3) Install all /contrib libraries 3) Install all /contrib modules
4) Get the list of _current_ typedefs by running: 4) Save a list of typedefs by running:
src/tools/find_typedef /usr/local/pgsql/bin /usr/local/pgsql/lib src/tools/find_typedef /usr/local/pgsql/bin /usr/local/pgsql/lib > /tmp/pgtypedefs
5) Add the typedef output to the pgindent script. 5) Run 'gmake distclean' from the top of the source tree to remove any
6) Run 'gmake distclean' from the top of the source tree to remove any
derived C files. derived C files.
7) From the top of the source tree, run: 6) From the top of the source tree, run:
find . -name '*.[ch]' -type f -print | find . -name '*.[ch]' -type f -print |
egrep -v '/s_lock.h|/ecpg/test/expected/|/snowball/libstemmer/' | egrep -v '/s_lock.h|/ecpg/test/expected/|/snowball/libstemmer/' |
xargs -n100 pgindent xargs -n100 pgindent /tmp/pgtypedefs
--------------------------------------------------------------------------- ---------------------------------------------------------------------------

File diff suppressed because it is too large Load Diff

View File

@ -1,29 +0,0 @@
#!/bin/sh
# $PostgreSQL: pgsql/src/tools/pgindent/pgjindent,v 1.3 2006/03/11 04:38:42 momjian Exp $
trap "rm -f /tmp/$$ /tmp/$$a" 0 1 2 3 15
entab </dev/null >/dev/null
if [ "$?" -ne 0 ]
then echo "Go to the src/tools/entab directory and do a 'make' and 'make install'." >&2
echo "This will put the 'entab' command in your path." >&2
echo "Then run $0 again."
exit 1
fi
astyle --version </dev/null >/dev/null 2>&1
if [ "$?" -eq 0 ]
then echo "You do not appear to have 'astyle' installed on your system." >&2
exit 1
fi
for FILE
do
astyle --style=java -b -p -j -S < "$FILE" >/tmp/$$ 2>/tmp/$$a
if [ "$?" -ne 0 -o -s /tmp/$$a ]
then echo "$FILE"
cat /tmp/$$a
fi
cat /tmp/$$ |
entab -t4 -qc |
cat >/tmp/$$a && cat /tmp/$$a >"$FILE"
done