Git fork

Merge branch 'ps/meson-build-docs'

The build procedure based on meson learned a target to only build
documentation, similar to "make doc".

* ps/meson-build-docs:
ci: don't compile whole project when testing docs with Meson
meson: print docs backend as part of the summary
meson: introduce a "docs" alias to compile documentation only

+24 -14
+2 -2
Documentation/howto/meson.build
··· 29 output: 'howto-index.adoc', 30 ) 31 32 - custom_target( 33 command: asciidoc_html_options, 34 input: howto_index, 35 output: 'howto-index.html', ··· 51 capture: true, 52 ) 53 54 - custom_target( 55 command: asciidoc_html_options, 56 input: howto_stripped, 57 output: fs.stem(howto_stripped.full_path()) + '.html',
··· 29 output: 'howto-index.adoc', 30 ) 31 32 + doc_targets += custom_target( 33 command: asciidoc_html_options, 34 input: howto_index, 35 output: 'howto-index.html', ··· 51 capture: true, 52 ) 53 54 + doc_targets += custom_target( 55 command: asciidoc_html_options, 56 input: howto_stripped, 57 output: fs.stem(howto_stripped.full_path()) + '.html',
+4 -4
Documentation/meson.build
··· 377 output: fs.stem(manpage) + '.xml', 378 ) 379 380 - custom_target( 381 command: [ 382 xmlto, 383 '-m', '@INPUT0@', ··· 400 endif 401 402 if get_option('docs').contains('html') 403 - custom_target( 404 command: asciidoc_common_options + [ 405 '--backend=' + asciidoc_html, 406 '--doctype=manpage', ··· 452 depends: documentation_deps, 453 ) 454 455 - custom_target( 456 command: [ 457 xsltproc, 458 '--xinclude', ··· 481 ] 482 483 foreach article : articles 484 - custom_target( 485 command: asciidoc_common_options + [ 486 '--backend=' + asciidoc_html, 487 '--out-file=@OUTPUT@',
··· 377 output: fs.stem(manpage) + '.xml', 378 ) 379 380 + doc_targets += custom_target( 381 command: [ 382 xmlto, 383 '-m', '@INPUT0@', ··· 400 endif 401 402 if get_option('docs').contains('html') 403 + doc_targets += custom_target( 404 command: asciidoc_common_options + [ 405 '--backend=' + asciidoc_html, 406 '--doctype=manpage', ··· 452 depends: documentation_deps, 453 ) 454 455 + doc_targets += custom_target( 456 command: [ 457 xsltproc, 458 '--xinclude', ··· 481 ] 482 483 foreach article : articles 484 + doc_targets += custom_target( 485 command: asciidoc_common_options + [ 486 '--backend=' + asciidoc_html, 487 '--out-file=@OUTPUT@',
+2 -2
Documentation/technical/meson.build
··· 46 output: 'api-index.adoc', 47 ) 48 49 - custom_target( 50 command: asciidoc_html_options, 51 input: api_index, 52 output: 'api-index.html', ··· 56 ) 57 58 foreach article : api_docs + articles 59 - custom_target( 60 command: asciidoc_html_options, 61 input: article, 62 output: fs.stem(article) + '.html',
··· 46 output: 'api-index.adoc', 47 ) 48 49 + doc_targets += custom_target( 50 command: asciidoc_html_options, 51 input: api_index, 52 output: 'api-index.html', ··· 56 ) 57 58 foreach article : api_docs + articles 59 + doc_targets += custom_target( 60 command: asciidoc_html_options, 61 input: article, 62 output: fs.stem(article) + '.html',
+2 -2
ci/test-documentation.sh
··· 48 49 # Build docs with Meson and AsciiDoc 50 meson setup build-asciidoc -Ddocs=html,man -Ddocs_backend=asciidoc 51 - meson compile -C build-asciidoc 52 check_docs build-asciidoc AsciiDoc 53 rm -rf build-asciidoc 54 55 # Build docs with Meson and AsciiDoctor 56 meson setup build-asciidoctor -Ddocs=html,man -Ddocs_backend=asciidoctor 57 - meson compile -C build-asciidoctor 58 check_docs build-asciidoctor Asciidoctor 59 rm -rf build-asciidoctor 60
··· 48 49 # Build docs with Meson and AsciiDoc 50 meson setup build-asciidoc -Ddocs=html,man -Ddocs_backend=asciidoc 51 + meson compile -C build-asciidoc docs 52 check_docs build-asciidoc AsciiDoc 53 rm -rf build-asciidoc 54 55 # Build docs with Meson and AsciiDoctor 56 meson setup build-asciidoctor -Ddocs=html,man -Ddocs_backend=asciidoctor 57 + meson compile -C build-asciidoctor docs 58 check_docs build-asciidoctor Asciidoctor 59 rm -rf build-asciidoctor 60
+2 -2
contrib/contacts/meson.build
··· 20 output: 'git-contacts.xml', 21 ) 22 23 - custom_target( 24 command: [ 25 xmlto, 26 '-m', '@INPUT@', ··· 39 endif 40 41 if get_option('docs').contains('html') 42 - custom_target( 43 command: asciidoc_common_options + [ 44 '--backend=' + asciidoc_html, 45 '--doctype=manpage',
··· 20 output: 'git-contacts.xml', 21 ) 22 23 + doc_targets += custom_target( 24 command: [ 25 xmlto, 26 '-m', '@INPUT@', ··· 39 endif 40 41 if get_option('docs').contains('html') 42 + doc_targets += custom_target( 43 command: asciidoc_common_options + [ 44 '--backend=' + asciidoc_html, 45 '--doctype=manpage',
+2 -2
contrib/subtree/meson.build
··· 38 output: 'git-subtree.xml', 39 ) 40 41 - custom_target( 42 command: [ 43 xmlto, 44 '-m', '@INPUT@', ··· 57 endif 58 59 if get_option('docs').contains('html') 60 - custom_target( 61 command: asciidoc_common_options + [ 62 '--backend=' + asciidoc_html, 63 '--doctype=manpage',
··· 38 output: 'git-subtree.xml', 39 ) 40 41 + doc_targets += custom_target( 42 command: [ 43 xmlto, 44 '-m', '@INPUT@', ··· 57 endif 58 59 if get_option('docs').contains('html') 60 + doc_targets += custom_target( 61 command: asciidoc_common_options + [ 62 '--backend=' + asciidoc_html, 63 '--doctype=manpage',
+10
meson.build
··· 2101 2102 subdir('bin-wrappers') 2103 if get_option('docs') != [] 2104 subdir('Documentation') 2105 endif 2106 2107 subdir('contrib') 2108 2109 exclude_from_check_headers = [ 2110 'compat/', ··· 2244 2245 summary({ 2246 'csprng': csprng_backend, 2247 'https': https_backend, 2248 'sha1': sha1_backend, 2249 'sha1_unsafe': sha1_unsafe_backend,
··· 2101 2102 subdir('bin-wrappers') 2103 if get_option('docs') != [] 2104 + doc_targets = [] 2105 subdir('Documentation') 2106 + else 2107 + docs_backend = 'none' 2108 endif 2109 2110 subdir('contrib') 2111 + 2112 + # Note that the target is intentionally configured after including the 2113 + # 'contrib' directory, as some tool there also have their own manpages. 2114 + if get_option('docs') != [] 2115 + alias_target('docs', doc_targets) 2116 + endif 2117 2118 exclude_from_check_headers = [ 2119 'compat/', ··· 2253 2254 summary({ 2255 'csprng': csprng_backend, 2256 + 'docs': docs_backend, 2257 'https': https_backend, 2258 'sha1': sha1_backend, 2259 'sha1_unsafe': sha1_unsafe_backend,