cellular-infrastructure
/
osmo-gsm-manuals
mirror of https://gerrit.osmocom.org/osmo-gsm-manuals
9
0
Fork 0
Code Releases Activity

Makefile.asciidoc.inc: always run verbose asciidoc 

a2x is a "toolchain manager" for asciidoc, that runs the asciidoc
command internally. Replace the previous logic of first running a2x
without any verbose flags, and on failure running asciidoc standalone,
with a verbose flag, to print the errors the occured. Always run a2x
with -vv, so it runs asciidoc in verbose mode.

This prevents losing the error message in case asciidoc or a2x fail
when running with a2x, but then asciidoc succeeds when running
standalone.

Related: OS#4132
Change-Id: I2cbd2985645ecdecc7851849be6a9a95d4b3246e
This commit is contained in:
Oliver Smith 2019-08-02 11:09:01 +02:00 committed by laforge
parent 35ca68b762
commit 2d5d6c54e8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/Makefile.asciidoc.inc
View File

@ -73,8 +73,7 @@ $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \
and remove three lines starting with '% \"DRAFT\" on first page'\n" \
|| true
TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \
a2x $(A2X_OPTS) $(notdir $<) || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \
asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<); exit 1)
a2x -vv $(A2X_OPTS) $(notdir $<)
check: $(ASCIIDOC_CHECKS)