diff options
author | Thomas Haller <thaller@redhat.com> | 2020-05-28 19:09:12 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2020-06-11 10:53:49 +0200 |
commit | 960ab397397a2688833fda6cf00e873624d42fd9 (patch) | |
tree | 183a380f455c6f3b459ff22dcb60b60b14be634d /libnm | |
parent | a9001261fbc0c7d8a51ed56e8cd3c5e880f0443b (diff) | |
download | NetworkManager-960ab397397a2688833fda6cf00e873624d42fd9.tar.gz |
docs: rename "nm-property-docs.xml" to "nm-settings-docs-gir.xml"
The name is bad. For one, we will have more files of the same format
("nm-settings-docs-nmcli.xml").
Also, "libnm/nm-settings-docs.xml" and "libnm/nm-property-docs.xml" had
basically the same file format. Their name should be similar.
Also the tool to generate the file should have a name that reminds to
the file that it creates.
Diffstat (limited to 'libnm')
-rwxr-xr-x | libnm/generate-docs-nm-settings-docs-gir.py (renamed from libnm/generate-setting-docs.py) | 0 | ||||
-rw-r--r-- | libnm/meson.build | 17 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libnm/generate-setting-docs.py b/libnm/generate-docs-nm-settings-docs-gir.py index f63c48b1ae..f63c48b1ae 100755 --- a/libnm/generate-setting-docs.py +++ b/libnm/generate-docs-nm-settings-docs-gir.py diff --git a/libnm/meson.build b/libnm/meson.build index 66fce80c8b..b77a759640 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -273,15 +273,14 @@ if enable_introspection 'LD_LIBRARY_PATH=' + ld_library_path, ] - name = 'nm-property-docs.xml' - nm_property_docs = custom_target( - name, + nm_settings_docs_xml_gir = custom_target( + 'nm-settings-docs-gir.xml', input: libnm_gir[0], - output: name, + output: 'nm-settings-docs-gir.xml', command: [ generate_setting_docs_env, python.path(), - join_paths(meson.current_source_dir(), 'generate-setting-docs.py'), + join_paths(meson.current_source_dir(), 'generate-docs-nm-settings-docs-gir.py'), '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@' @@ -289,17 +288,21 @@ if enable_introspection depends: libnm_gir, ) + nm_settings_docs_xml = { + 'gir': nm_settings_docs_xml_gir, + } + name = 'nm-settings-docs.xml' nm_settings_docs = custom_target( name, - input: [nm_property_docs, nm_property_infos_xml['dbus']], + input: [nm_settings_docs_xml_gir, nm_property_infos_xml['dbus']], output: name, command: [ python.path(), join_paths(meson.current_source_dir(), 'generate-docs-nm-settings-docs-merge.py'), '@OUTPUT@', nm_property_infos_xml['dbus'], - nm_property_docs, + nm_settings_docs_xml_gir, ], depends: libnm_gir, ) |