Commit cc692a69 authored by Inigo Martínez's avatar Inigo Martínez Committed by Thomas Haller

build: Remove documentation generation workarounds

Documentation was not working in meson due to problems with files
generated in `libnm`. To avoid these problems, workarounds were
used. This problems have been recently fixed so these workarounds
are not necessary anymore.

https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00061.html
parent 25d5384c
......@@ -44,9 +44,7 @@ sources = shared_meta_setting + files(
settings_docs = 'settings-docs.c'
# FIXME: there is a problem with the generated file
#if enable_introspection
if false
if enable_introspection
settings_docs_source = custom_target(
settings_docs,
input: nm_property_docs,
......
......@@ -7,9 +7,7 @@ settings_xml = custom_target(
output,
input: nm_settings_docs,
output: output,
command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), settings + '.xsl'), '@INPUT@'],
# FIXME: used to built properly api documentation
build_by_default: true
command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), settings + '.xsl'), '@INPUT@']
)
configure_file(
......
......@@ -177,9 +177,7 @@ foreach docbook: docbooks
input: docbook[1],
output: output,
capture: true,
command: [perl, enums_to_docbook, docbook[0], docbook[2], '@INPUT@'],
# FIXME: used to built properly api documentation
build_by_default: true
command: [perl, enums_to_docbook, docbook[0], docbook[2], '@INPUT@']
)
content_files += xml.full_path()
......
......@@ -219,7 +219,6 @@ if enable_introspection
install_dir_typelib: typelib_dir
)
# FIXME: the script parses the meson.source_root()/Makefile.am file
generate_plugin_docs = join_paths(meson.current_source_dir(), 'generate-plugin-docs.pl')
name = 'nm-settings-keyfile-docs.xml'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment