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

Ensure the git version + commit date ends up in PDF 

This is a bit awkward, as the 'revnumber' asciidoc variable so far
doesn't seem to end up in the docbook-xml.  We now put it into
'releaseinfo' which gets then put into \DBKreleeaseinfo by dblatex.

makefile watermark fixup
This commit is contained in:
Harald Welte 2016-02-20 18:06:45 +01:00
parent 593eaf6173
commit 5fcea8028d
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/Makefile.asciidoc.inc
View File

@ -1,5 +1,8 @@
BUILDDIR = $(TOPDIR)/build
GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)
GIT_DATE := $(shell date -d @`git log -n 1 "--pretty=%at" ../.` "+%Y-%b-%e")
# prepend the document name with the version numbe suffix
#DOCS_VER = $(foreach P, $(ASCIIDOCS), $(P)-v$(shell xmllint --recover --xpath "//revnumber[position()=last()]/text()" $(P)-docinfo.xml 2>/dev/null))
#PDFS = $(DOCS_VER:%=%.pdf)
@ -11,7 +14,19 @@ ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex.sty
cleanfiles += $(ASCIIDOCPDFS)
ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf
DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes
ifeq (,$(BUILD_RELEASE))
DBLATEX_OPTS += -P draft.watermark=1
else
DBLATEX_OPTS += -P draft.watermark=0
endif
A2X_OPTS := -L --asciidoc-opts="$(ASCIIDOC_OPTS)" --dblatex-opts="$(DBLATEX_OPTS)" -a docinfo -a revnumber="$(GIT_VERSION)" -a revdate="$(GIT_DATE)"
all: $(ASCIIDOCPDFS)
$(ASCIIDOCPDFS): %.pdf: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc
a2x -L --asciidoc-opts="-f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf" --dblatex-opts=" -s $(ASCIIDOCSTYLE)" -a docinfo $< || asciidoc -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf $<
a2x $(A2X_OPTS) $< || asciidoc -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf $<

2
build/custom-dblatex.sty
View File

@ -67,6 +67,8 @@
% left footer
\def\DBKpublisher{}
\def\releasebox{\DBKreleaseinfo, \DBKdate}
\def\maketitle{
\DBKcover
\DBKcopyright

5
build/docinfo-releaseinfo.conf Normal file
View File

@ -0,0 +1,5 @@
[+docinfo]
# this ensures that the asciidoc 'revnumber' ends up in some docbook-xml
# tag, from where we can then subsequently pick it up via the dblatex
# stylesheet.
<releaseinfo>{revnumber}</releaseinfo>