summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-01-12 08:20:54 -0500
committerRich Salz <rsalz@openssl.org>2017-01-12 09:31:36 -0500
commit65c1f979ee9346d63bb6e81f25bb7dffda99b342 (patch)
treeb7cb7f3f6121e0bacb968554ccd69fd2d66a15a7
parent29ee1be50ca2bc8feb3efa1d75740bd539566516 (diff)
Review comments; fail build if nits found
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2202)
-rw-r--r--.gitignore1
-rw-r--r--.travis.yml4
-rw-r--r--Configurations/unix-Makefile.tmpl7
3 files changed, 7 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 0a7edfc6c8..bf4a9dedf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -177,3 +177,4 @@ pod2htmd.tmp
# Windows manifest files
*.manifest
+doc-nits
diff --git a/.travis.yml b/.travis.yml
index b6c87662dd..a60c40289f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,9 @@ compiler:
- gcc
env:
- - CONFIG_OPTS="" DESTDIR="_install" CHECKDOCS="yes"
+ - CONFIG_OPTS="" DESTDIR="_install"
- CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2"
- - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes"
+ - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes" CHECKDOCS="yes"
- CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes"
- CONFIG_OPTS="no-stdio --strict-warnings" BUILDONLY="yes"
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index eefb50a8ea..a2b197d3ee 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -323,9 +323,6 @@ install_sw: all install_dev install_engines install_runtime
uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
-doc-nits:
- $(PERL) util/find-doc-nits.pl -n
-
install_docs: install_man_docs install_html_docs
uninstall_docs: uninstall_man_docs uninstall_html_docs
@@ -677,6 +674,10 @@ update: generate errors ordinals
generate: generate_apps generate_crypto_bn generate_crypto_objects \
generate_crypto_conf generate_crypto_asn1
+doc-nits:
+ (cd $(SRCDIR); $(PERL) util/find-doc-nits.pl -n ) >doc-nits
+ if [ -s doc-nits ] ; then cat doc-nits; exit 1; fi
+
# Test coverage is a good idea for the future
#coverage: $(PROGRAMS) $(TESTPROGRAMS)
# ...