diff options
| -rw-r--r-- | man/meson.build | 98 | ||||
| -rw-r--r-- | meson.build | 29 |
2 files changed, 63 insertions, 64 deletions
diff --git a/man/meson.build b/man/meson.build index bb00b6e3dd..4132f826a8 100644 --- a/man/meson.build +++ b/man/meson.build @@ -37,7 +37,7 @@ man_pages = [] html_pages = [] source_xml_files = [] dbus_docs = [] -foreach tuple : xsltproc.found() ? manpages : [] +foreach tuple : manpages stem = tuple[0] section = tuple[1] aliases = tuple[2] @@ -57,46 +57,47 @@ foreach tuple : xsltproc.found() ? manpages : [] mandirn = get_option('mandir') / ('man' + section) if condition == '' or conf.get(condition) == 1 - p1 = custom_target( - man, - input : xml, - output : [man] + manaliases, - command : xslt_cmd + [custom_man_xsl, '@INPUT@'], - depends : custom_entities_ent, - install : want_man, - install_dir : mandirn) - man_pages += p1 - - p2 = [] - foreach htmlalias : htmlaliases - link = custom_target( - htmlalias, - output : htmlalias, - command : [ln, '-fs', html, '@OUTPUT@']) - if want_html - dst = docdir / 'html' / htmlalias - cmd = 'ln -fs @0@ $DESTDIR@1@'.format(html, dst) - meson.add_install_script('sh', '-c', cmd) - p2 += link - endif - html_pages += link - endforeach - - p3 = custom_target( - html, - input : xml, - output : html, - command : xslt_cmd + [custom_html_xsl, '@INPUT@'], - depends : [custom_entities_ent, p2], - install : want_html, - install_dir : docdir / 'html') - html_pages += p3 - file = files(tuple[0] + '.xml') - source_xml_files += file if tuple[0].startswith('org.freedesktop.') dbus_docs += file endif + + if xsltproc.found() + p1 = custom_target( + man, + input : xml, + output : [man] + manaliases, + command : xslt_cmd + [custom_man_xsl, '@INPUT@'], + depends : custom_entities_ent, + install : want_man, + install_dir : mandirn) + man_pages += p1 + + p2 = [] + foreach htmlalias : htmlaliases + link = custom_target( + htmlalias, + output : htmlalias, + command : [ln, '-fs', html, '@OUTPUT@']) + if want_html + dst = docdir / 'html' / htmlalias + cmd = 'ln -fs @0@ $DESTDIR@1@'.format(html, dst) + meson.add_install_script('sh', '-c', cmd) + p2 += link + endif + html_pages += link + endforeach + + p3 = custom_target( + html, + input : xml, + output : html, + command : xslt_cmd + [custom_html_xsl, '@INPUT@'], + depends : [custom_entities_ent, p2], + install : want_html, + install_dir : docdir / 'html') + html_pages += p3 + endif else message('Skipping @0@.@1@ because @2@ is false'.format(stem, section, condition)) endif @@ -213,3 +214,26 @@ configure_file( input : 'html.in', output : 'html', configuration : buildroot_substs) + +############################################################ + +update_dbus_docs = custom_target( + 'update-dbus-docs', + output : 'update-dbus-docs', + command : [update_dbus_docs_py, '--build-dir', project_build_root, '@INPUT@'], + input : dbus_docs) + +if conf.get('BUILD_MODE_DEVELOPER') == 1 + test('dbus-docs-fresh', + update_dbus_docs_py, + args : ['--build-dir', project_build_root, '--test', dbus_docs]) +endif + +update_man_rules = custom_target( + 'update-man-rules', + output : 'update-man-rules', + command : [sh, '-c', + 'cd @0@ && '.format(project_build_root) + + 'python3 @0@/tools/update-man-rules.py $(find @0@ -wholename "*/man/*.xml") >t && '.format(project_source_root) + + 'mv t @0@/rules/meson.build'.format(meson.current_source_dir())], + depends : custom_entities_ent) diff --git a/meson.build b/meson.build index e9a506e163..ad336c60ea 100644 --- a/meson.build +++ b/meson.build @@ -3731,33 +3731,8 @@ run_target( depends : [man, libsystemd, libudev], command : [check_api_docs_sh, libsystemd.full_path(), libudev.full_path()]) -############################################################ - -if dbus_docs.length() > 0 - custom_target( - 'update-dbus-docs', - output : 'update-dbus-docs', - command : [update_dbus_docs_py, - '--build-dir=@0@'.format(project_build_root), - '@INPUT@'], - input : dbus_docs) - - if conf.get('BUILD_MODE_DEVELOPER') == 1 - test('dbus-docs-fresh', - update_dbus_docs_py, - args : ['--build-dir=@0@'.format(project_build_root), - '--test'] + dbus_docs) - endif -endif - -custom_target( - 'update-man-rules', - output : 'update-man-rules', - command : [sh, '-c', - 'cd @0@ && '.format(meson.build_root()) + - 'python3 @0@/tools/update-man-rules.py $(find @0@ -wholename "*/man/*.xml") >t && '.format(project_source_root) + - 'mv t @0@/man/rules/meson.build'.format(meson.current_source_dir())], - depends : custom_entities_ent) +alias_target('update-dbus-docs', update_dbus_docs) +alias_target('update-man-rules', update_man_rules) ############################################################ watchdog_opt = service_watchdog == '' ? 'disabled' : service_watchdog |