DescriptionNew patch set to address JR and GP's helpful comments. I've used $(buildscript-dir)/run-and-check rather than setting another env variable - this is equally as short and so I think OK. Name changed. I'm thinking this is good to go now - please confirm.
===============================================
This uses a shell script that I've written to direct the output from a command to a logfile, and to issue a line identifying the logfile if the command fails. I've updated the calls (all of them, I believe) to makeinfo and texi2html to use this script. The result is about 3400 fewer lines output from make doc, and lots of lovely logfiles to check for errors - it makes debugging docs a lot easier. It's slightly non-trivial to test, since neither makeinfo or texi2html stops on errored input by default. If you force it to do so (see below) sample output is:
/home/phil/lilypond-git/scripts/build/CheckAndRun.sh "DEPTH=../../.. AJAX_SEARCH= TOP_SRC_DIR=/home/phil/lilypond-git PERL_UNICODE=SD texi2html --error-limit=0 --I=/home/phil/lilypond-git/input/regression/lilypond-book --I=./out-www -I /home/phil/lilypond-git/Documentation --I=/media/IntelSSD/lilypond/lilypond-git/build/./out-www/xref-maps --init-file=/home/phil/lilypond-git/Documentation/lilypond-texi2html.init --output=out-www/collated-files.html out-www/collated-files.texi" "collated-files.texilog.log"
Please check the logfile collated-files.texilog.log for errors
make[4]: *** [out-www/collated-files.html] Error 2
make[4]: Leaving directory `/media/IntelSSD/lilypond/lilypond-git/build/input/regression/lilypond-book'
make[3]: *** [WWW-2] Error 2
make[3]: Leaving directory `/media/IntelSSD/lilypond/lilypond-git/build/input/regression'
make[2]: *** [WWW-2] Error 2
make[2]: Leaving directory `/media/IntelSSD/lilypond/lilypond-git/build/input'
make[1]: *** [WWW-2] Error 2
make[1]: Leaving directory `/media/IntelSSD/lilypond/lilypond-git/build'
make: *** [doc] Error 2
Command exited with non-zero status 2
The logfile that's fingered contains this:
*** Duplicate node found: Top (in out-www/papersize-docs.texi l. 8)
Max error number exceeded
To show this in action, you would need to edit texinfo-vars.make as below.
-TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
+TEXI2HTML_FLAGS += --error-limit=0 $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
Patch Set 1 #
Total comments: 3
Patch Set 2 : Addresses JR and GP comments #
Total comments: 3
Patch Set 3 : Updated patch set with David's syntax #
MessagesTotal messages: 21
|