[Olena-patches] 4002: More fixes for documentation build system.

* doc/Makefile.am: - Fix invalid replacement in doxyfile. - Fix invalid rule names. - Fix invalid dist files. * tests/tools/pretty_check.sh: return the make check return value. --- milena/ChangeLog | 11 +++++++++++ milena/doc/Makefile.am | 11 ++++++++--- milena/tests/tools/pretty_check.sh | 5 ++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3b282d2..90ac090 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-06-05 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + More fixes for documentation build system. + + * doc/Makefile.am: + - Fix invalid replacement in doxyfile. + - Fix invalid rule names. + - Fix invalid dist files. + + * tests/tools/pretty_check.sh: return the make check return value. + +2009-06-05 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Small fixes. * milena/doc/Doxyfile.in: fix missing backspace. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 3e23eab..9e5b840 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -18,7 +18,9 @@ DOXYGEN = doxygen # Doxygen documentation output directory. -user: user-doc-html user-doc +user/html: ref-doc-html + +user/latex/refman.pdf: ref-doc doc-all: doc doc-html doc-dev doc-dev-html @@ -36,6 +38,7 @@ doc-dev-html: tutorial-html ref-guide-html white-paper-html ref-doc-dev-html ref-doc-dev: Doxyfile examples $(DOXYGEN) Doxyfile_complete_pdf + cd complete/latex && make $(AM_MAKEFLAGS) ref-doc-dev-html: Doxyfile examples $(DOXYGEN) Doxyfile_complete @@ -43,6 +46,7 @@ ref-doc-dev-html: Doxyfile examples ref-doc: Doxyfile examples $(DOXYGEN) Doxyfile_user_pdf + cd user/latex && make $(AM_MAKEFLAGS) ref-doc-html: Doxyfile examples $(DOXYGEN) Doxyfile_user @@ -100,7 +104,7 @@ edit_pdf = sed -e 's,GENERATE_LATEX = NO,GENERATE_LATEX = YES,g' \ # documentation (complete and user) using @VARIABLES@. Don't generate # Doxyfile_user from Doxyfile_complete! Both should be a product # derived from a single source, Doxyfile.in. -edit_user = sed -e 's,OUTPUT_DIRECTORY = ./complete/,OUTPUT_DIRECTORY = ./user/,g' \ +edit_user = sed -e 's,OUTPUT_DIRECTORY = ./complete/,OUTPUT_DIRECTORY = ./user/,g' \ -e 's,EXTRACT_ALL = YES,EXTRACT_ALL = NO,g' \ -e 's,EXTRACT_PRIVATE = YES,EXTRACT_PRIVATE = NO,g' \ -e 's,EXTRACT_STATIC = YES,EXTRACT_STATIC = NO,g' \ @@ -138,7 +142,8 @@ include $(srcdir)/outputs/outputs.mk EXTRA_DIST += \ Doxyfile.in \ groups \ - user \ + user/html \ + user/latex/refman.pdf \ tools/clearbanner.sh \ tools/sample_utils.hh \ tools/split_sample.sh \ diff --git a/milena/tests/tools/pretty_check.sh b/milena/tests/tools/pretty_check.sh index 738342e..b2dea8f 100755 --- a/milena/tests/tools/pretty_check.sh +++ b/milena/tests/tools/pretty_check.sh @@ -346,6 +346,7 @@ main() make_gcc_wrapper make CXX="$gcc_wrapper" -C $base_make_path check -k 1>$check_log 2>&1 + rvalue=$? cd $output_directory begin_tmp_files @@ -407,6 +408,8 @@ main() # Cleanup temporary files. cleanup_tmp_files cleanup_gcc_wrapper + + return rvalue } -main +return main -- 1.5.6.5