diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-10-12 17:45:56 -0400 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2019-10-31 14:19:29 +0100 |
| commit | 9fcb9702fba8aa135945f96aefddf050a6f4f11d (patch) | |
| tree | 5fa0e0061ca70c9b0678636ee68c713653e7dba8 /.travis.yml | |
| parent | fb1ecf85c9f732e5827771ff243d7a70e06ce112 (diff) | |
Infrastructure for templated doc in POD files
Use new doc-build capabilities
Add -i flag to dofile.
Add doc/man1 to SUBDIRS for the new templated doc files
Rewrite commit a397aca (merged from PR 10118) to use the doc-template stuff.
Put template references in common place
Template options and text come at the end of command-specific options:
opt_x, opt_trust, opt_r (in that order).
Refactor xchain options.
Do doc-nits after building generated sources.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10159)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 9f616c7e00..4b104642ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -177,14 +177,14 @@ script: echo -e '\052\052 FAILED -- UPDATED FILES NOT COMMITED'; travis_terminate 1; fi - - if test -n "$CHECKDOCS" && ! $make doc-nits; then - echo -e '\052\052 FAILED -- MAKE DOC-NITS'; - travis_terminate 1; - fi - if test -n "$GENERATE" && ! $make build_all_generated; then echo -e '\052\052 FAILED -- MAKE BUILD_ALL_GENERATED'; travis_terminate 1; fi + - if test -n "$CHECKDOCS" && ! $make doc-nits; then + echo -e '\052\052 FAILED -- MAKE DOC-NITS'; + travis_terminate 1; + fi - if ! $make2; then echo -e '\052\052 FAILED -- MAKE'; travis_terminate 1; |