[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  65c1f979ee9346d63bb6e81f25bb7dffda99b342 (commit)
       via  29ee1be50ca2bc8feb3efa1d75740bd539566516 (commit)
      from  23103a52e96d6126400ca135421e67c7d664dfe5 (commit)


- Log -----------------------------------------------------------------
commit 65c1f979ee9346d63bb6e81f25bb7dffda99b342
Author: Rich Salz <rsalz at openssl.org>
Date:   Thu Jan 12 08:20:54 2017 -0500

    Review comments; fail build if nits found
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2202)

commit 29ee1be50ca2bc8feb3efa1d75740bd539566516
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jan 9 22:41:26 2017 -0500

    Run find-doc-nits in travis
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2202)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                        | 1 +
 .travis.yml                       | 5 ++++-
 Configurations/unix-Makefile.tmpl | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0a7edfc..bf4a9de 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 c46956b..a60c402 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ compiler:
 env:
     - 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"
 
@@ -110,6 +110,9 @@ script:
           cd _build;
       fi
     - $make update
+    - if [ -n "$CHECKDOCS" ]; then
+          $make doc-nits;
+      fi
     - $make
     - if [ -z "$BUILDONLY" ]; then
           if [ -n "$CROSS_COMPILE" ]; then
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 84ceb76..a2b197d 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -674,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)
 #	...