osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34157 )
Change subject: build/Makefile.asciidoc: print less clutter
......................................................................
build/Makefile.asciidoc: print less clutter
* Move the comments above the build targets, so they don't get printed
during the build
* Remove the "TO REMOVE DRAFT MODE…" note. Printing this is no longer
useful, the manuals for releases are now generated automatically with
the Osmocom-release-manuals jenkins job, which removes the draft mode.
There is no need to do this step manually.
Depends: osmo-ci Ia27cb8e4dd0204c0a91c322bed65bf8c9847a7be
Change-Id: I23d11bab274793eb8bcedc3fd9290901823e32d2
---
M build/Makefile.asciidoc.inc
1 file changed, 28 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals
refs/changes/57/34157/1
diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc
index 848f1f1..75aa36f 100644
--- a/build/Makefile.asciidoc.inc
+++ b/build/Makefile.asciidoc.inc
@@ -59,6 +59,12 @@
all: $(ASCIIDOC_PDF)
+# ln: a2x can't use a different output file. To support out-of-tree builds,
+# we create a symlink at $(builddir)/srcfile.adoc pointing at
+# $(srcdir)/srcfile.adoc. $< is the $(srcdir)/srcfile.adoc,
+# $(notdir) is like basename from coreutils, and $(builddir) is $PWD.
+# TEXINPUTS: find LaTeX includes like
\includegraphics{./common/images/sysmocom.pdf}
+# in $(OSMO_GSM_MANUALS_DIR).
$(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \
$(ASCIIDOC_DEPS) \
$(ASCIIDOCSTYLE) \
@@ -66,20 +72,10 @@
$(COMMONDIR)/images/* \
build common
- # a2x can't use a different output file. To support out-of-tree builds,
- # we create a symlink at $(builddir)/srcfile.adoc pointing at
- # $(srcdir)/srcfile.adoc. $< is the $(srcdir)/srcfile.adoc,
- # $(notdir) is like basename from coreutils, and $(builddir) is $PWD.
if ! [ -f $(notdir $<) ]; then \
ln -s $< $(notdir $<); \
fi
- # TEXINPUTS: find LaTeX includes like
\includegraphics{./common/images/sysmocom.pdf}
- # in $(OSMO_GSM_MANUALS_DIR).
- @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\
- NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT
build/custom-dblatex.sty\n\
- and remove three lines starting with '% \"DRAFT\" on first
page'\n" \
- || true
TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \
a2x -vv $(A2X_OPTS) $(notdir $<)
@@ -88,23 +84,22 @@
$(MAKE) $(ASCIIDOC_CHECKS); \
fi
+# ln: out-of-tree building: use a symlink to the output file like done in
+# the non-check build above, so the relative include paths work the same.
+# touch: Make absolutely sure that the %.check target is updated.
+# grep: Do print the WARNING output but return error if any was found
+# (grep -v would omit the WARNING output from the log).
$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \
$(ASCIIDOCSTYLE) \
$(COMMONDIR)/chapters/*.adoc \
$(ASCIIDOC_DEPS) \
build common
- # out-of-tree building: use a symlink to the output file like done in
- # the non-check build above, so the relative include paths work the
- # same.
if ! [ -f $(notdir $<) ]; then \
ln -s $< $(notdir $<); \
fi
asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<) > $(notdir $@) 2>&1
- # Make absolutely sure that the %.check target is updated.
touch $(notdir $@)
- # Do print the WARNING output but return error if any was found
- # (grep -v would omit the WARNING output from the log).
@grep WARNING $(notdir $@) && exit 1 || exit 0
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34157
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: I23d11bab274793eb8bcedc3fd9290901823e32d2
Gerrit-Change-Number: 34157
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-MessageType: newchange
