Update include scripts

bmomjian · bmomjian · commit 8e6697fcd9da · 2000-06-14T22:28:16.000Z
diff --git a/src/tools/pginclude/README 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
@@ -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
@@ -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
@@ -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/pgrminclude 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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`:`
	`2`	`+# create macro calls for all defines in the file`
	`3`	`+`
`2`	`4`	`trap "rm -f /tmp/$$" 0 1 2 3 15`
`3`	`5`	`for FILE`
`4`	`6`	`do`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`:`
`2`		`-# mark includes as <> or ""`
	`2`	`+# change #include's to <> or ""`
`3`	`3`
`4`	`4`	`trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15`
`5`	`5`	`find . \( -name CVS -a -prune \) -o -type f -print \|`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`:`
`2`		`-# report which include files can not compile on their own`
	`2`	`+# report which #include files can not compile on their own`
	`3`	`+# takes -v option to display compile failure message and line numbers`
`3`	`4`
`4`	`5`	`trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a" 0 1 2 3 15`
`5`	`6`	`find . \( -name CVS -a -prune \) -o -name '*.[ch]' -type f -print \| while read FILE`