This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.orgHello Jenkins Builder, Holger Freyther, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/1089 to look at the new patch set (#5). add 'make check' target Generate *.check files from asciidoc output and grep for WARNINGs. Add *.check files to gitignore and to 'make clean'. Change-Id: Ibccc83a3415930a528f2e8e4e4dda3b81c6d0b64 --- M .gitignore M Makefile M OsmoBSC/Makefile M OsmoBTS/Makefile M OsmoNITB/Makefile M OsmoPCU/Makefile M OsmoSGSN/Makefile M build/Makefile.asciidoc.inc 8 files changed, 28 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/89/1089/5 diff --git a/.gitignore b/.gitignore index 6455215..67c2f69 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ *.html *__*.png *__*.svg +*.check generated/ diff --git a/Makefile b/Makefile index cfe7fc0..035595c 100644 --- a/Makefile +++ b/Makefile @@ -24,3 +24,13 @@ cd OsmoSGSN; $(MAKE) upload cd OsmoNAT; $(MAKE) upload cd OsmoPCU; $(MAKE) upload + +check: + cd OsmoBTS; $(MAKE) check + cd OsmoNITB; $(MAKE) check + cd OsmoBSC; $(MAKE) check + cd OsmoSGSN; $(MAKE) check + cd OsmoPCU; $(MAKE) check + # These don't use asciidoc, so they have no 'make check' target: + #cd OsmoMGCP; $(MAKE) check + #cd OsmoNAT; $(MAKE) check diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile index fb5e269..9fc6f26 100644 --- a/OsmoBSC/Makefile +++ b/OsmoBSC/Makefile @@ -24,7 +24,7 @@ clean: rm -rf $(cleanfiles) - rm -rf osmobsc-usermanual__*.{svg,png} + rm -rf osmobsc-usermanual__*.{svg,png,check} gen-bsc-vty-docbook: FORCE $(call command,xsltproc -o generated/combined1.xml \ diff --git a/OsmoBTS/Makefile b/OsmoBTS/Makefile index 5ef9afa..0587de8 100644 --- a/OsmoBTS/Makefile +++ b/OsmoBTS/Makefile @@ -12,5 +12,5 @@ clean: rm -rf $(cleanfiles) - rm -rf osmobts-abis__*.{svg,png} - rm -rf osmobts-usermanual__*.{svg,png} + rm -rf osmobts-abis__*.{svg,png,check} + rm -rf osmobts-usermanual__*.{svg,png,check} diff --git a/OsmoNITB/Makefile b/OsmoNITB/Makefile index d3bf5c8..e68b9b0 100644 --- a/OsmoNITB/Makefile +++ b/OsmoNITB/Makefile @@ -23,7 +23,7 @@ clean: rm -rf $(cleanfiles) - rm -rf osmonitb-usermanual__*.{svg,png} + rm -rf osmonitb-usermanual__*.{svg,png,check} gen-nitb-vty-docbook: FORCE $(call command,xsltproc -o generated/combined1.xml \ diff --git a/OsmoPCU/Makefile b/OsmoPCU/Makefile index 6b4ecb8..1f06183 100644 --- a/OsmoPCU/Makefile +++ b/OsmoPCU/Makefile @@ -25,7 +25,7 @@ clean: rm -rf $(cleanfiles) rm -rf gen-vty-docbook - rm -rf osmopcu-usermanual__*.{svg,png} + rm -rf osmopcu-usermanual__*.{svg,png,check} gen-vty-docbook: FORCE $(call command,xsltproc -o generated/combined1.xml \ diff --git a/OsmoSGSN/Makefile b/OsmoSGSN/Makefile index 612c10f..7df5168 100644 --- a/OsmoSGSN/Makefile +++ b/OsmoSGSN/Makefile @@ -22,7 +22,7 @@ osmosgsn-usermanual.pdf: chapters/*.adoc clean: - rm -rf osmosgsn-usermanual__*.{svg,png} + rm -rf osmosgsn-usermanual__*.{svg,png,check} rm -rf $(cleanfiles) gen-sgsn-vty-docbook: FORCE diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 7def592..f95cd0b 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -9,6 +9,7 @@ # generate list of PDFs that we're supposed to render ASCIIDOCPDFS = $(ASCIIDOCS:%=%.pdf) +ASCIIDOC_CHECKS = $(ASCIIDOCS:%=%.check) ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex.sty @@ -30,3 +31,13 @@ $(ASCIIDOCPDFS): %.pdf: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc a2x $(A2X_OPTS) $< || asciidoc -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf $< + +check: $(ASCIIDOC_CHECKS) + +$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc chapters/*.adoc + asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1 + # Make absolutely sure that the %.check target is updated. + touch $@ + # Do print the WARNING output but return error if any was found + # (grep -v would omit the WARNING output from the log). + @grep WARNING $@ && exit 1 || exit 0 -- To view, visit https://gerrit.osmocom.org/1089 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibccc83a3415930a528f2e8e4e4dda3b81c6d0b64 Gerrit-PatchSet: 5 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Holger Freyther <holger at freyther.de> Gerrit-Reviewer: Jenkins Builder