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

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.

svn path=/trunk/; revision=2778

diff --git a/ChangeLog b/ChangeLog
index a5a4457..d56a951 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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.
+
+2009-01-02  Behdad Esfahbod  <behdad@gnome.org>
+
        * pango-view/viewer-main.c (main):
        * pango-view/viewer-pangocairo.c (pangocairo_view_render):
        * pango-view/viewer-pangoft2.c (pangoft2_view_render):

diff --git a/docs/Makefile.am b/docs/Makefile.am
index b07e206..6cdba24 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -95,6 +95,9 @@ endif
 
 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 @@ endif
 .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)"

diff --git a/docs/check.docs b/docs/check.docs
index 986af6d..2898fc5 100755 (executable)
--- a/docs/check.docs
+++ b/docs/check.docs
@@ -11,33 +11,38 @@ if test -z "$DOC_MODULE"; then
        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