pango r2778 - in trunk: . docs

[behdad svn gnome org]

Author: behdad
Date: Sat Jan  3 01:03:45 2009
New Revision: 2778
URL: http://svn.gnome.org/viewvc/pango?rev=2778&view=rev

Log:
2009-01-02  Behdad Esfahbod  <behdad gnome org>

        Bug 512662 â Update check.docs for pango-undeclared.txt

        * docs/Makefile.am:
        * docs/check.docs:
        Sync to the version in cairo.

Modified:
   trunk/ChangeLog
   trunk/docs/Makefile.am
   trunk/docs/check.docs

Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am	(original)
+++ trunk/docs/Makefile.am	Sat Jan  3 01:03:45 2009
@@ -95,6 +95,9 @@
 
 include $(top_srcdir)/gtk-doc.make
 
+# This line really belongs in gtk-doc.mk
+$(REPORT_FILES): sgml-build.stamp
+
 ########################################################################
 
 man_MANS = pango-querymodules.1 
@@ -146,3 +149,4 @@
 .PHONY: dist-local-check-no-cross-references
 
 TESTS = check.docs
+TESTS_ENVIRONMENT = srcdir="$(srcdir)" top_srcdir="$(top_srcdir)" MAKE="$(MAKE) $(AM_MAKEFLAGS)" DOC_MODULE="$(DOC_MODULE)" REPORT_FILES="$(REPORT_FILES)"

Modified: trunk/docs/check.docs
==============================================================================
--- trunk/docs/check.docs	(original)
+++ trunk/docs/check.docs	Sat Jan  3 01:03:45 2009
@@ -11,33 +11,38 @@
 	fi
 fi
 
-
-test -z "$srcdir" && srcdir=.
-status=0
-
-if ! test -f "$DOC_MODULE-undocumented.txt" -a -f "$DOC_MODULE-unused.txt"; then
-	echo At least one of "$DOC_MODULE-undocumented.txt" and "$DOC_MODULE-unused.txt" not found.
-	echo Skipping test.
-	exit 0
+if test -n "$REPORT_FILES"; then
+	$MAKE $REPORT_FILES || exit 1
 fi
 
-status=0
+test -z "$srcdir" && srcdir=.
+stat=0
 
+if test -f "$DOC_MODULE-undeclared.txt"; then
+	undeclared=`cat "$DOC_MODULE-undeclared.txt"`
+	if test -n "$undeclared"; then
+		echo Undeclared documentation symbols: 1>&2
+		cat "$DOC_MODULE-undeclared.txt" 1>&2
+		stat=1
+	fi
+fi >&2
 if test -f "$DOC_MODULE-unused.txt"; then
 	unused=`cat "$DOC_MODULE-unused.txt"`
 	if test -n "$unused"; then
 		echo Unused documentated symbols: 1>&2
 		cat "$DOC_MODULE-unused.txt" 1>&2
-		status=1
+		stat=1
 	fi
-fi
+fi >&2
 if test -f "$DOC_MODULE-undocumented.txt"; then
-	if ! grep '^0 symbols incomplete' "$DOC_MODULE-undocumented.txt" >/dev/null ||
-	   ! grep '^0 not documented'     "$DOC_MODULE-undocumented.txt" >/dev/null; then
+	if grep '^0 symbols incomplete' "$DOC_MODULE-undocumented.txt" >/dev/null &&
+	   grep '^0 not documented'     "$DOC_MODULE-undocumented.txt" >/dev/null; then
+		:
+	else
 		echo Incomplete or undocumented symbols: 1>&2
 		cat "$DOC_MODULE-undocumented.txt" 1>&2
-		status=1
+		stat=1
 	fi
-fi
+fi >&2
 
-exit $status
+exit $stat