Reviewers: dak, Graham Percival, Julien Rioux,
Message:
Latest GOP 9 make doc reduction - please review.
Description:
I've opened a new issue to avoid confusion. AFAICS this redirects all
the output from texi2pdf, makeinfo and tex2html to logfiles. I've used
Julien and David's suggestion of getting rid of --batch and --quiet, and
it turns of the < /dev/null isn't needed when texi2pdf is run like this.
make; make doc is good. If I edit notation.tely to put a load of
random @ \ in, make doc fails with this on the terminal:
extract_texi_filenames.py: Processing out-www/notation.texi
writing:
/media/IntelSSD/lilypond/lilypond-git/build/./out-www/xref-maps/notation.xref-map
lilypond-book.py (GNU LilyPond) 2.15.30
Please check the logfile notation.texi2pdf.log for errors
make[2]: *** [out-www/notation.pdf] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: Leaving directory
`/media/IntelSSD/lilypond/lilypond-git/build/Documentation'
make[1]: *** [WWW-1] Error 2
make[1]: Leaving directory `/media/IntelSSD/lilypond/lilypond-git/build'
make: *** [doc-stage-1] Error 2
The contents of the logfile are:
cat notation.texi2pdf.log
This is pdfTeX, Version 3.1415926-1.40.10 (TeX Live 2009/Debian)
entering extended mode
(./notation.texi (/home/phil/lilypond-git/tex/texinfo.tex
Loading texinfo [version 2009-08-14.15]: pdf, fonts, markup, glyphs,
page headings, tables, conditionals, indexing, sectioning, toc,
environments,
defuns, macros, cross references, insertions,
(/usr/share/texmf-texlive/tex/generic/epsf/epsf.tex
This is `epsf.tex' v2.7.3 <23 July 2005>
) localization, formatting, and turning on texinfo input format.)
(./notation.aux) (/home/phil/lilypond-git/tex/txi-en.tex)
Runaway argument?
@@\\@\\\@@@@\
./notation.texi:17: Paragraph ended before @\ was complete.
<to be read again>
@par
l.17
?
./notation.texi:17: Emergency stop.
<to be read again>
@par
l.17
./notation.texi:17: ==> Fatal error occurred, no output PDF file
produced!
Transcript written on notation.log.
/usr/bin/texi2dvi: pdfetex exited with bad status, quitting.
I'm hoping this is this part of GOP 9 complete.
Please review this at http://codereview.appspot.com/5650064/
Affected files:
M Documentation/GNUmakefile
M make/doc-i18n-root-rules.make
M make/doc-i18n-root-vars.make
A scripts/build/run-and-check.sh
M stepmake/stepmake/texinfo-rules.make
M stepmake/stepmake/texinfo-vars.make
Index: Documentation/GNUmakefile
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index
22da2d8fa8d73a3746c11f5d9d64f641fb45fda1..511b19a2d17286b038dd0ad27342193044a1971b
100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -195,7 +195,7 @@ endif
### Rules
$(outdir)/lilypond-%.info: $(outdir)/%.texi
$(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
$(outdir)/weblinks.itexi
- $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--output=$@ $<" "$*.makeinfo.log"
txt-to-html: $(OUT_TXT_FILES) $(OUT_TXT_FILES:%.txt=%.html)
@@ -231,11 +231,11 @@ endif
# Ugh, using '%' twice not possible
$(outdir)/notation/notation.xml: $(outdir)/notation.texi
mkdir -p $(dir $@)
- $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(dir $@) --docbook $<
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--output=$(dir $@) --docbook $<" "$*.makeinfo.log"
$(outdir)/internals/internals.xml: $(outdir)/internals.texi
mkdir -p $(dir $@)
- $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(dir $@) --docbook $<
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--output=$(dir $@) --docbook $<" "$*.makeinfo.log"
$(outdir)/learning.texi $(outdir)/notation.texi: $(OUT_PDF_IMAGES)
Index: make/doc-i18n-root-rules.make
diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make
index
3cdd664471ffc6541a413c2c4c019950c3d77a9f..e240334b36e145e62f8c591d42b2009f109bf1d7
100644
--- a/make/doc-i18n-root-rules.make
+++ b/make/doc-i18n-root-rules.make
@@ -7,19 +7,17 @@ $(outdir)/web.texi: $(outdir)/weblinks.itexi
$(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html:
$(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map
$(TRANSLATION_LILY_IMAGES)
mkdir -p $(dir $@)
mkdir -p $(outdir)/$*
- DEPTH=$(depth)/../ $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS)
--output=$(outdir)/$* $< >$*.splittexi.log 2>&1
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)/../ $(TEXI2HTML)
$(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output=$(outdir)/$*
$<" "$*.splittexi.log"
find $(outdir)/$* -name '*.html' | xargs grep -L 'UNTRANSLATED NODE:
IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link
--prepend-suffix .$(ISOLANG) hard $(outdir)
$(top-build-dir)/Documentation/$(outdir)
$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html:
$(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map
$(TRANSLATION_LILY_IMAGES)
- DEPTH=$(depth) $(TEXI2HTML) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $<
$*.bigtexi.log 2>&1
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth) $(TEXI2HTML) -D bigpage
$(TEXI2HTML_FLAGS) --output=$@ $<" "$*.bigtexi.log"
$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).html:
$(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map
$(outdir)/version.itexi $(outdir)/weblinks.itexi
- DEPTH=$(depth) $(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $< >$*.texilog
2>&1
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth) $(TEXI2HTML)
$(TEXI2HTML_FLAGS) --output=$@ $<" "$*.texilog"
$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf: $(outdir)/%.texi
- cd $(outdir) && \
- texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $*.texi && \
- mkdir -p $(dir $@) && mv $*.pdf $@
+ $(buildscript-dir)/run-and-check "cd $(outdir) && texi2pdf
$(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $*.texi && mkdir -p $(dir $@)
&& mv $*.pdf $@" "$*.texi2pdf.log"
$(outdir)/version.%: $(top-src-dir)/VERSION
$(PYTHON) $(top-src-dir)/scripts/build/create-version-itexi.py > $@
@@ -45,11 +43,11 @@ $(TRANSLATION_LILY_IMAGES): $(MASTER_TEXI_FILES)
touch $@
$(outdir)/lilypond-%.info: $(outdir)/%.texi
$(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
$(outdir)/weblinks.itexi
- $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--output=$@ $<" "$*.makeinfo.log"
$(outdir)/index.$(ISOLANG).html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
$(outdir)/index.$(ISOLANG).html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
$(outdir)/index.$(ISOLANG).html:
- DEPTH=$(depth) $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(TEXI2HTML_SPLIT)
--output=$(outdir)/ web.texi
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth) $(TEXI2HTML)
$(TEXI2HTML_FLAGS) $(TEXI2HTML_SPLIT) --output=$(outdir)/
web.texi" "webtexi.log"
find $(outdir)/ -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE
ME' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link
--prepend-suffix .$(ISOLANG) hard $(outdir)
$(top-build-dir)/Documentation/$(outdir)
Index: make/doc-i18n-root-vars.make
diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index
8c20f494bde0106e624edd30e2a9c140267dcd84..8f6f11e97f110388b6314e622863b6136b2c7fbf
100644
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -59,12 +59,8 @@ TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES)
$(TEXI2HTML_LANG) $(TEXI2HTML_INIT)
TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
###########
-TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)
+TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
TEXI2PDF_FLAGS += -I $(LYS_OUTPUT_DIR)
-ifdef QUIET_BUILD
-TEXI2PDF_FLAGS += -q
-endif
-
DOCUMENTATION_LOCALE_TARGET = $(outdir)/doc-po
TRANSLATION_LILY_IMAGES = $(outdir)/translation-lily-images
Index: scripts/build/run-and-check.sh
diff --git a/scripts/build/run-and-check.sh b/scripts/build/run-and-check.sh
new file mode 100755
index
0000000000000000000000000000000000000000..9757cecbccd8b2a8b8323a740e078aa31e0cdee5
--- /dev/null
+++ b/scripts/build/run-and-check.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+eval $1 > $2 2>&1
+RetVal=$?
+if [ $RetVal -ne 0 ]; then
+ echo
+ echo "Please check the logfile" $2 "for errors"
+ echo
+fi
+exit $RetVal
Index: stepmake/stepmake/texinfo-rules.make
diff --git a/stepmake/stepmake/texinfo-rules.make
b/stepmake/stepmake/texinfo-rules.make
index
a3133d6aeae0e10522058c5accab51c641650f38..b3bba0f1e95f31b8f4d024a0128c9db20b1b4799
100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -34,44 +34,45 @@ $(outdir)/%.itexi: %.itexi
$(outdir)/%.info: $(outdir)/%.texi
$(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
$(outdir)/weblinks.itexi
ifeq ($(WEB_VERSION),yes)
- $(MAKEINFO) -I$(src-dir) -I$(outdir) -D web_version --output=$@ $<
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir) -D
web_version --output=$@ $<" "$*.makeinfo.log"
else
- $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--output=$@ $<" "$*.makeinfo.log"
endif
$(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map
$(outdir)/version.itexi $(outdir)/weblinks.itexi
ifeq ($(WEB_VERSION),yes)
- DEPTH=$(depth) AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS)
-D bigpage -D web_version --output=$@ $<
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage -D
web_version --output=$@ $<" "$*.bigtexi.log"
else
- DEPTH=$(depth) AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS)
-D bigpage --output=$@ $<
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage
--output=$@ $<" "$*.bigtexi.log"
endif
$(outdir)/%.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map
$(outdir)/version.itexi $(outdir)/weblinks.itexi
- DEPTH=$(depth) AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS)
--output=$@ $<
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@
$<" "$*.texilog.log"
+
$(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map
$(outdir)/version.itexi $(outdir)/weblinks.itexi $(outdir)/%.html.omf
mkdir -p $(dir $@)
ifeq ($(WEB_VERSION),yes)
- DEPTH=$(depth)/../ AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML)
$(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) -D web_version --output=$(dir $@) $<
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)/../
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_SPLIT)
$(TEXI2HTML_FLAGS) -D web_version --output=$(dir $@) $<" "$*.splittexi.log"
else
- DEPTH=$(depth)/../ AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML)
$(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output=$(dir $@) $<
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)/../
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_SPLIT)
$(TEXI2HTML_FLAGS) --output=$(dir $@) $<" "$*.splittexi.log"
endif
$(XREF_MAPS_DIR)/%.xref-map: $(outdir)/%.texi
$(buildscript-dir)/extract_texi_filenames $(XREF_MAP_FLAGS) -o
$(XREF_MAPS_DIR) $<
$(outdir)/%.info: %.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep
$(outdir)/version.itexi $(outdir)/weblinks.itexi
- $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--output=$@ $<" "$*.makeinfo.log"
$(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.itexi
$(outdir)/%.pdf.omf $(outdir)/weblinks.itexi
ifeq ($(WEB_VERSION),yes)
- cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) -D web_version -I $(abs-src-dir)
--quiet $(TEXINFO_PAPERSIZE_OPTION) $(<F)
+ $(buildscript-dir)/run-and-check "cd $(outdir); texi2pdf
$(TEXI2PDF_FLAGS) -D web_version -I $(abs-src-dir)
$(TEXINFO_PAPERSIZE_OPTION) $(<F)" "$*.texi2pdf.log"
else
- cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) -I $(abs-src-dir) --quiet
$(TEXINFO_PAPERSIZE_OPTION) $(<F)
+ $(buildscript-dir)/run-and-check "cd $(outdir); texi2pdf
$(TEXI2PDF_FLAGS) -I $(abs-src-dir) $(TEXINFO_PAPERSIZE_OPTION)
$(<F)" "$*.texi2pdf.log"
endif
$(outdir)/%.txt: $(outdir)/%.texi $(outdir)/version.itexi
$(outdir)/weblinks.itexi
- $(MAKEINFO) -I$(src-dir) -I$(outdir) --no-split --no-headers --output $@
$<
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--no-split --no-headers --output $@ $<" "$*.makeinfo.log"
$(outdir)/%.html.omf: %.texi
$(call GENERATE_OMF,html)
Index: stepmake/stepmake/texinfo-vars.make
diff --git a/stepmake/stepmake/texinfo-vars.make
b/stepmake/stepmake/texinfo-vars.make
index
2f2d801ab1210e1bc784306df498c5e84d5b553f..28a48b94aa2b2a74af345f5046b7ce6b111eba8e
100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -57,13 +57,8 @@ TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES)
$(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
###########
-
TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
-ifdef QUIET_BUILD
-TEXI2PDF_FLAGS += -q
-endif
-
# info stuff
INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
INFO_INSTALL_COMMAND = $(if $(INFO_INSTALL_FILES),\
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel