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
This commit is contained in:
parent
2d5d6c54e8
commit
5275f262c8
|
@ -75,7 +75,10 @@ $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \
|
||||||
TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \
|
TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \
|
||||||
a2x -vv $(A2X_OPTS) $(notdir $<)
|
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 \
|
$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \
|
||||||
$(ASCIIDOCSTYLE) \
|
$(ASCIIDOCSTYLE) \
|
||||||
|
|
|
@ -28,6 +28,15 @@ then
|
||||||
AC_MSG_ERROR("missing dependencies!")
|
AC_MSG_ERROR("missing dependencies!")
|
||||||
fi
|
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(
|
AC_OUTPUT(
|
||||||
osmo-gsm-manuals.pc
|
osmo-gsm-manuals.pc
|
||||||
Makefile
|
Makefile
|
||||||
|
|
|
@ -12,7 +12,7 @@ fi
|
||||||
osmo-clean-workspace.sh
|
osmo-clean-workspace.sh
|
||||||
|
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
./configure
|
./configure --enable-asciidoc-warnings-check
|
||||||
$MAKE $PARALLEL_MAKE
|
$MAKE $PARALLEL_MAKE
|
||||||
$MAKE $PARALLEL_MAKE check
|
$MAKE $PARALLEL_MAKE check
|
||||||
$MAKE $PARALLEL_MAKE distcheck
|
$MAKE $PARALLEL_MAKE distcheck
|
||||||
|
|
Loading…
Reference in New Issue