From 8e6697fcd9da32e42e206cc6012f18d3328d2f12 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 14 Jun 2000 22:28:16 +0000
Subject: [PATCH] Update include scripts
---
src/tools/pginclude/README | 10 ++++++++++
src/tools/pginclude/pgdefine | 2 ++
src/tools/pginclude/pgfixinclude | 2 +-
src/tools/pginclude/pginclude | 3 ++-
src/tools/pginclude/{pgnoinclude => pgrminclude} | 4 ++--
5 files changed, 17 insertions(+), 4 deletions(-)
create mode 100644 src/tools/pginclude/README
rename src/tools/pginclude/{pgnoinclude => pgrminclude} (95%)
diff --git a/src/tools/pginclude/README b/src/tools/pginclude/README
new file mode 100644
index 00000000000..9ed3ebae97b
--- /dev/null
+++ b/src/tools/pginclude/README
@@ -0,0 +1,10 @@
+These utilities help clean up #include file usage:
+
+pgfixinclude change #include's to <> or ""
+pgrminclude remove extra #include's
+pginclude [-v] report which #include files can not compile on their own
+
+pgdefine create macro calls for all defines in the file (used by
+ the above routines)
+
+
diff --git a/src/tools/pginclude/pgdefine b/src/tools/pginclude/pgdefine
index 3411c358561..953a29684a1 100755
--- a/src/tools/pginclude/pgdefine
+++ b/src/tools/pginclude/pgdefine
@@ -1,4 +1,6 @@
:
+# create macro calls for all defines in the file
+
trap "rm -f /tmp/$$" 0 1 2 3 15
for FILE
do
diff --git a/src/tools/pginclude/pgfixinclude b/src/tools/pginclude/pgfixinclude
index 6e70ad696c6..d76710a0624 100755
--- a/src/tools/pginclude/pgfixinclude
+++ b/src/tools/pginclude/pgfixinclude
@@ -1,5 +1,5 @@
:
-# mark includes as <> or ""
+# change #include's to <> or ""
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
find . \( -name CVS -a -prune \) -o -type f -print |
diff --git a/src/tools/pginclude/pginclude b/src/tools/pginclude/pginclude
index b7b0449e7d0..4658d48b38b 100755
--- a/src/tools/pginclude/pginclude
+++ b/src/tools/pginclude/pginclude
@@ -1,5 +1,6 @@
:
-# report which include files can not compile on their own
+# report which #include files can not compile on their own
+# takes -v option to display compile failure message and line numbers
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a" 0 1 2 3 15
find . \( -name CVS -a -prune \) -o -name '*.[ch]' -type f -print | while read FILE
diff --git a/src/tools/pginclude/pgnoinclude b/src/tools/pginclude/pgrminclude
similarity index 95%
rename from src/tools/pginclude/pgnoinclude
rename to src/tools/pginclude/pgrminclude
index 29dc60bc272..e91997bc3f5 100755
--- a/src/tools/pginclude/pgnoinclude
+++ b/src/tools/pginclude/pgrminclude
@@ -1,5 +1,5 @@
:
-# report which files have extra includes
+# remove extra #include's
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
find . \( -name CVS -a -prune \) -o -type f -print |
@@ -52,7 +52,7 @@ do
mv /tmp/$$b "$FILE"
# reload after #include removal
if [ "$IS_INCLUDE" = "Y" ]
- then cat "$FILE" | grep -v "^#if" | grep -v "^#else" |
+ then cat "$FILE" | grep -v "^#if" | grep -v "^#else" |
grep -v "^#endif" | sed 's/->[a-zA-Z0-9_\.]*//g' >/tmp/$$a
else cat "$FILE" >/tmp/$$a
fi
--
GitLab