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/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 ) Change subject: Makefile.asciidoc.inc: warnings check not default ...................................................................... Makefile.asciidoc.inc: warnings check not default Only check for asciidoc warnings in "make check" if ASCIIDOC_WARNINGS_CHECK is set. Enable it in jenkins.sh by using the new ./configure --enable-asciidoc-warnings-check parameter (similar to --enable-werror in other Osmocom projects' configure.ac files). Related: OS#4140 Change-Id: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 --- M build/Makefile.asciidoc.inc M configure.ac M contrib/jenkins.sh 3 files changed, 14 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 77f3b1d..7cb660f 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -75,7 +75,10 @@ TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ a2x -vv $(A2X_OPTS) $(notdir $<) -check: $(ASCIIDOC_CHECKS) +check: + if [ -n "$$ASCIIDOC_WARNINGS_CHECK" ]; then \ + $(MAKE) $(ASCIIDOC_CHECKS); \ + fi $(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \ $(ASCIIDOCSTYLE) \ diff --git a/configure.ac b/configure.ac index 9858af6..1017e9c 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,15 @@ AC_MSG_ERROR("missing dependencies!") fi +# Asciidoc warnings check (OS#4140) +AC_ARG_ENABLE(asciidoc_warnings_check, + [AS_HELP_STRING( + [--enable-asciidoc-warnings-check], + [Fail the build if asciidoc prints any warnings] + )], + [asciidoc_warnings_check=$enableval], [asciidoc_warnings_check="no"]) +AM_CONDITIONAL([ASCIIDOC_WARNINGS_CHECK], [test x"$asciidoc_warnings_check" = x"yes"]) + AC_OUTPUT( osmo-gsm-manuals.pc Makefile diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0c40e2f..cf709b2 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -12,7 +12,7 @@ osmo-clean-workspace.sh autoreconf -fi -./configure +./configure --enable-asciidoc-warnings-check $MAKE $PARALLEL_MAKE $MAKE $PARALLEL_MAKE check $MAKE $PARALLEL_MAKE distcheck -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/15031 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: Iac993a0d1b17205397a1f1ef1a7bd3f9df739e36 Gerrit-Change-Number: 15031 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at gnumonks.org> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190805/577ba046/attachment.htm>