[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: c1504d42be015884b164eff3764b32cb1eab2c1c

[code]

revision:            c1504d42be015884b164eff3764b32cb1eab2c1c
date:                2010-12-25T19:26:09
author:              address@hidden
branch:              net.venge.monotone.source-tree-cleanup
changelog:
Adapt the script so it finds and recognizes base.hh also when included
with a relative path.

manifest:
format_version "1"

new_manifest [efed4966b94b5d605420f74470b2e8093e39b713]

old_revision [06e00a73afb1adc3dff4f5fcd03fc3023c8a5dd4]

patch "util/audit-includes"
 from [f7e39d48e8637517540e8aa6a3ba17e9ea115cae]
   to [d5757fcf83ab116fba16c53221da0f832307a113]
============================================================
--- util/audit-includes	f7e39d48e8637517540e8aa6a3ba17e9ea115cae
+++ util/audit-includes	d5757fcf83ab116fba16c53221da0f832307a113
@@ -32,15 +32,16 @@ egrep -H "$(printf '^[ \t]*#[ \t]*includ
 	  (*.hh|*.h) found_base_hh=skip ;;
 	  (*)        found_base_hh=f ;;
 	esac
-      fi	
+      fi
 
+      basename=$(basename $file)
       case "$header" in
         # The rules for base.hh are:
 	# No header file should include base.hh.
 	# All source files should include base.hh, as their very first
 	# inclusion.
         
-        (base.hh)
+        (*/base.hh|base.hh)
 	  case "$file" in
 	    (*.hh|*.h) shouldnt_base_hh="$shouldnt_base_hh $file" ;;
 	    ($current) late_base_hh="$late_base_hh $file"
@@ -51,20 +52,20 @@ egrep -H "$(printf '^[ \t]*#[ \t]*includ
 
 	# The rules for these are simple: nobody should include them
 	# (except base.hh itself).
-	(config.h)
-	  if [ "$file" != "base.hh" ]
+	(*/config.h|config.h)
+	  if [ "$basename" != "base.hh" ]
 	  then shouldnt_config_h="$shouldnt_config_h $file"
 	  fi;;
-	(gettext.h)
-	  if [ "$file" != "base.hh" ]
+	(*/gettext.h|gettext.h)
+	  if [ "$basename" != "base.hh" ]
 	  then shouldnt_gettext_h="$shouldnt_gettext_h $file"
 	  fi;;
 	(string)
-	  if [ "$file" != "base.hh" ]
+	  if [ "$basename" != "base.hh" ]
 	  then shouldnt_string="$shouldnt_string $file"
 	  fi;;
 	(iosfwd)
-	  if [ "$file" != "base.hh" ]
+	  if [ "$basename" != "base.hh" ]
 	  then shouldnt_iosfwd="$shouldnt_iosfwd $file"
 	  fi;;
       esac