From 5ea37bcabade6c00ef5bc454d9a6ddc49dfdd3cc Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Jun 2015 15:22:14 +0100 Subject: [PATCH] Makefile.am (stamp-pdf-doxygen): Grep for LaTeX errors in log. * doc/Makefile.am (stamp-pdf-doxygen): Grep for LaTeX errors in log. * doc/Makefile.in: Regenerate. From-SVN: r225191 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/doc/Makefile.am | 2 ++ libstdc++-v3/doc/Makefile.in | 2 ++ 3 files changed, 7 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e2d1f51f374..f159f786b7d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2015-06-30 Jonathan Wakely + * doc/Makefile.am (stamp-pdf-doxygen): Grep for LaTeX errors in log. + * doc/Makefile.in: Regenerate. + * include/bits/stl_pair.h: Replace class keyword with typename. 2015-06-30 Ville Voutilainen diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am index d6ea2d1648d..d63cf17db8e 100644 --- a/libstdc++-v3/doc/Makefile.am +++ b/libstdc++-v3/doc/Makefile.am @@ -257,6 +257,7 @@ stamp-latex-doxygen: ${doxygen_outdir}/latex # include asking a wizard to enlarge capacity. If this is the case, # find texmf.cnf and add a zero for pool_size, string_vacancies, # max_strings, and pool_free values. +# Errors like "File `foo.sty' not found" mean a TeX package is missing. stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf -(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;) echo "Generating doxygen pdf file..."; @@ -265,6 +266,7 @@ stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf echo ":: PDF file is ${api_pdf}"; \ else \ echo "... error"; \ + grep -F 'LaTeX Error' ${doxygen_outdir}/latex/refman.log; \ exit 12; \ fi $(STAMP) stamp-pdf-doxygen diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 4690fad8ac6..798a9a3ae37 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -891,6 +891,7 @@ stamp-latex-doxygen: ${doxygen_outdir}/latex # include asking a wizard to enlarge capacity. If this is the case, # find texmf.cnf and add a zero for pool_size, string_vacancies, # max_strings, and pool_free values. +# Errors like "File `foo.sty' not found" mean a TeX package is missing. stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf -(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;) echo "Generating doxygen pdf file..."; @@ -899,6 +900,7 @@ stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf echo ":: PDF file is ${api_pdf}"; \ else \ echo "... error"; \ + grep -F 'LaTeX Error' ${doxygen_outdir}/latex/refman.log; \ exit 12; \ fi $(STAMP) stamp-pdf-doxygen -- 2.30.2