2020-12-23 22:21:36 +01:00
|
|
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
2020-01-14 10:42:24 +01:00
|
|
|
|
2017-11-25 11:39:06 +01:00
|
|
|
libnm_inc = include_directories('.')
|
|
|
|
|
|
2019-09-07 23:00:41 +02:00
|
|
|
libnm_nm_default_dep = declare_dependency(
|
2019-09-09 11:40:11 +02:00
|
|
|
sources: libnm_core_enum_sources[1],
|
2019-09-07 23:00:41 +02:00
|
|
|
include_directories: libnm_inc,
|
|
|
|
|
dependencies: libnm_core_nm_default_dep,
|
|
|
|
|
)
|
|
|
|
|
|
2017-11-25 11:39:06 +01:00
|
|
|
libnm_headers = files(
|
|
|
|
|
'NetworkManager.h',
|
|
|
|
|
'nm-access-point.h',
|
|
|
|
|
'nm-active-connection.h',
|
2018-05-10 09:03:47 +02:00
|
|
|
'nm-autoptr.h',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-checkpoint.h',
|
|
|
|
|
'nm-client.h',
|
2018-05-22 16:45:05 +02:00
|
|
|
'nm-device-6lowpan.h',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-device-adsl.h',
|
|
|
|
|
'nm-device-bond.h',
|
|
|
|
|
'nm-device-bridge.h',
|
|
|
|
|
'nm-device-bt.h',
|
|
|
|
|
'nm-device-dummy.h',
|
|
|
|
|
'nm-device-ethernet.h',
|
|
|
|
|
'nm-device-generic.h',
|
|
|
|
|
'nm-device-infiniband.h',
|
|
|
|
|
'nm-device-ip-tunnel.h',
|
|
|
|
|
'nm-device-macsec.h',
|
|
|
|
|
'nm-device-macvlan.h',
|
|
|
|
|
'nm-device-modem.h',
|
|
|
|
|
'nm-device-olpc-mesh.h',
|
2019-01-28 12:39:38 +01:00
|
|
|
'nm-device-ovs-bridge.h',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-device-ovs-interface.h',
|
|
|
|
|
'nm-device-ovs-port.h',
|
|
|
|
|
'nm-device-ppp.h',
|
|
|
|
|
'nm-device-team.h',
|
|
|
|
|
'nm-device-tun.h',
|
2020-11-12 21:58:13 +01:00
|
|
|
'nm-device-veth.h',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-device-vlan.h',
|
2019-12-05 10:36:54 +01:00
|
|
|
'nm-device-vrf.h',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-device-vxlan.h',
|
2019-01-28 12:39:38 +01:00
|
|
|
'nm-device-wifi-p2p.h',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-device-wifi.h',
|
|
|
|
|
'nm-device-wimax.h',
|
2018-03-13 13:42:38 +00:00
|
|
|
'nm-device-wireguard.h',
|
2018-03-09 17:19:36 +01:00
|
|
|
'nm-device-wpan.h',
|
2019-01-28 12:39:38 +01:00
|
|
|
'nm-device.h',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-dhcp-config.h',
|
2021-01-09 12:00:33 +01:00
|
|
|
'nm-ethtool-utils.h',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-ip-config.h',
|
|
|
|
|
'nm-object.h',
|
|
|
|
|
'nm-remote-connection.h',
|
2017-12-15 14:35:32 +01:00
|
|
|
'nm-secret-agent-old.h',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-types.h',
|
|
|
|
|
'nm-vpn-connection.h',
|
|
|
|
|
'nm-vpn-editor.h',
|
2017-12-15 14:35:32 +01:00
|
|
|
'nm-vpn-plugin-old.h',
|
|
|
|
|
'nm-vpn-service-plugin.h',
|
2019-01-28 12:39:38 +01:00
|
|
|
'nm-wifi-p2p-peer.h',
|
2018-10-18 12:50:20 +02:00
|
|
|
'nm-wimax-nsp.h',
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
|
|
|
|
|
2017-12-15 14:35:32 +01:00
|
|
|
install_headers(
|
2019-09-03 09:48:59 +02:00
|
|
|
libnm_core_headers + libnm_headers + [nm_version_macro_header],
|
2018-10-18 12:50:20 +02:00
|
|
|
subdir: libnm_name,
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
|
|
|
|
|
2019-09-10 09:17:23 +02:00
|
|
|
libnm_enum_sources = gnome.mkenums(
|
2021-01-27 21:15:32 +01:00
|
|
|
'nm-enum-types',
|
2019-09-10 09:17:23 +02:00
|
|
|
sources: libnm_headers + [nm_version_macro_header],
|
2017-11-25 11:39:06 +01:00
|
|
|
identifier_prefix: nm_id_prefix,
|
2021-01-27 21:15:32 +01:00
|
|
|
c_template: 'nm-enum-types.c.template',
|
|
|
|
|
h_template: 'nm-enum-types.h.template',
|
2017-11-25 11:39:06 +01:00
|
|
|
install_header: true,
|
2018-10-18 12:50:20 +02:00
|
|
|
install_dir: libnm_pkgincludedir,
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
libnm_sources = files(
|
|
|
|
|
'nm-access-point.c',
|
|
|
|
|
'nm-active-connection.c',
|
|
|
|
|
'nm-checkpoint.c',
|
|
|
|
|
'nm-client.c',
|
|
|
|
|
'nm-dbus-helpers.c',
|
2018-05-22 16:45:05 +02:00
|
|
|
'nm-device-6lowpan.c',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-device-adsl.c',
|
|
|
|
|
'nm-device-bond.c',
|
|
|
|
|
'nm-device-bridge.c',
|
|
|
|
|
'nm-device-bt.c',
|
|
|
|
|
'nm-device-dummy.c',
|
|
|
|
|
'nm-device-ethernet.c',
|
|
|
|
|
'nm-device-generic.c',
|
|
|
|
|
'nm-device-infiniband.c',
|
|
|
|
|
'nm-device-ip-tunnel.c',
|
|
|
|
|
'nm-device-macsec.c',
|
|
|
|
|
'nm-device-macvlan.c',
|
|
|
|
|
'nm-device-modem.c',
|
|
|
|
|
'nm-device-olpc-mesh.c',
|
2019-01-28 12:39:38 +01:00
|
|
|
'nm-device-ovs-bridge.c',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-device-ovs-interface.c',
|
|
|
|
|
'nm-device-ovs-port.c',
|
|
|
|
|
'nm-device-ppp.c',
|
|
|
|
|
'nm-device-team.c',
|
|
|
|
|
'nm-device-tun.c',
|
2020-11-12 21:58:13 +01:00
|
|
|
'nm-device-veth.c',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-device-vlan.c',
|
2019-12-05 10:36:54 +01:00
|
|
|
'nm-device-vrf.c',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-device-vxlan.c',
|
2019-01-28 12:39:38 +01:00
|
|
|
'nm-device-wifi-p2p.c',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-device-wifi.c',
|
|
|
|
|
'nm-device-wimax.c',
|
2018-03-13 13:42:38 +00:00
|
|
|
'nm-device-wireguard.c',
|
2018-03-09 17:19:36 +01:00
|
|
|
'nm-device-wpan.c',
|
2019-01-28 12:39:38 +01:00
|
|
|
'nm-device.c',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-dhcp-config.c',
|
|
|
|
|
'nm-dhcp4-config.c',
|
|
|
|
|
'nm-dhcp6-config.c',
|
|
|
|
|
'nm-dns-manager.c',
|
|
|
|
|
'nm-ip-config.c',
|
|
|
|
|
'nm-ip4-config.c',
|
|
|
|
|
'nm-ip6-config.c',
|
2019-05-15 14:50:40 +02:00
|
|
|
'nm-libnm-utils.c',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-object.c',
|
|
|
|
|
'nm-remote-connection.c',
|
|
|
|
|
'nm-secret-agent-old.c',
|
|
|
|
|
'nm-vpn-connection.c',
|
|
|
|
|
'nm-vpn-editor.c',
|
2019-01-28 12:39:38 +01:00
|
|
|
'nm-vpn-plugin-old.c',
|
2017-11-25 11:39:06 +01:00
|
|
|
'nm-vpn-service-plugin.c',
|
2019-01-28 12:39:38 +01:00
|
|
|
'nm-wifi-p2p-peer.c',
|
2018-10-18 12:50:20 +02:00
|
|
|
'nm-wimax-nsp.c',
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
|
|
|
|
|
2021-01-27 21:23:57 +01:00
|
|
|
libnm_static = static_library(
|
|
|
|
|
'nm-static',
|
2019-09-10 09:17:23 +02:00
|
|
|
sources: libnm_sources + libnm_enum_sources,
|
2021-01-27 21:15:32 +01:00
|
|
|
dependencies: [
|
|
|
|
|
libnmdbus_dep,
|
|
|
|
|
libnm_libnm_core_intern_dep,
|
|
|
|
|
libnm_nm_default_dep,
|
|
|
|
|
libnm_udev_aux_dep,
|
|
|
|
|
libudev_dep,
|
|
|
|
|
],
|
|
|
|
|
c_args: [
|
2021-02-04 16:04:15 +01:00
|
|
|
'-DG_LOG_DOMAIN="libnm"',
|
2021-01-27 21:15:32 +01:00
|
|
|
],
|
2019-09-11 11:45:10 +02:00
|
|
|
link_with: libnm_systemd_logging_stub,
|
2019-05-15 14:50:40 +02:00
|
|
|
)
|
|
|
|
|
|
2019-09-10 09:17:23 +02:00
|
|
|
linker_script = join_paths(meson.current_source_dir(), 'libnm.ver')
|
|
|
|
|
|
2019-05-15 14:50:40 +02:00
|
|
|
libnm = shared_library(
|
|
|
|
|
'nm',
|
|
|
|
|
version: libnm_version,
|
2019-09-07 23:00:41 +02:00
|
|
|
dependencies: libnm_nm_default_dep,
|
2021-01-27 21:15:32 +01:00
|
|
|
link_whole: [
|
2021-01-27 21:23:57 +01:00
|
|
|
libnm_static,
|
2021-01-27 21:15:32 +01:00
|
|
|
libnm_core,
|
|
|
|
|
libnmdbus,
|
|
|
|
|
libnm_systemd_logging_stub,
|
|
|
|
|
libnm_glib_aux,
|
|
|
|
|
],
|
2019-09-10 09:17:23 +02:00
|
|
|
link_args: '-Wl,--version-script,@0@'.format(linker_script),
|
2018-01-11 12:34:40 +01:00
|
|
|
link_depends: linker_script,
|
2018-10-18 12:50:20 +02:00
|
|
|
install: true,
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
libnm_dep = declare_dependency(
|
2019-09-10 09:17:23 +02:00
|
|
|
sources: libnm_enum_sources[1],
|
|
|
|
|
include_directories: libnm_inc,
|
2018-10-18 12:50:20 +02:00
|
|
|
link_with: libnm,
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
pkg.generate(
|
|
|
|
|
libraries: libnm,
|
|
|
|
|
version: nm_version,
|
2018-01-09 08:05:15 +01:00
|
|
|
name: libnm_name,
|
2017-11-25 11:39:06 +01:00
|
|
|
description: 'Convenience library for clients of NetworkManager',
|
2018-01-09 08:05:15 +01:00
|
|
|
filebase: libnm_name,
|
|
|
|
|
subdirs: libnm_name,
|
2017-11-25 11:39:06 +01:00
|
|
|
requires: 'gio-2.0',
|
|
|
|
|
variables: [
|
|
|
|
|
'exec_prefix=${prefix}',
|
2018-10-18 12:50:20 +02:00
|
|
|
'vpnservicedir=' + join_paths('${prefix}', 'lib', nm_name, 'VPN'),
|
|
|
|
|
],
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
|
|
|
|
|
2018-06-26 18:36:31 +02:00
|
|
|
test(
|
2018-01-09 08:05:15 +01:00
|
|
|
'check-local-exports-' + libnm_name,
|
2018-06-26 18:36:31 +02:00
|
|
|
check_exports,
|
|
|
|
|
args: [libnm.full_path(), linker_script],
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if enable_introspection
|
|
|
|
|
|
|
|
|
|
libnm_gir = gnome.generate_gir(
|
|
|
|
|
libnm,
|
2021-02-07 21:12:20 +01:00
|
|
|
sources: libnm_core_sources + libnm_core_headers + libnm_core_enum_sources + libnm_sources + libnm_headers + libnm_enum_sources + [nm_version_macro_header],
|
2019-09-10 09:17:23 +02:00
|
|
|
includes: 'Gio-2.0',
|
2017-11-25 11:39:06 +01:00
|
|
|
nsversion: nm_gir_version,
|
|
|
|
|
namespace: 'NM',
|
|
|
|
|
identifier_prefix: nm_id_prefix,
|
|
|
|
|
symbol_prefix: nm_id_prefix.to_lower(),
|
2018-03-24 15:18:21 +00:00
|
|
|
header: 'NetworkManager.h',
|
2019-09-10 09:17:23 +02:00
|
|
|
export_packages: libnm_name,
|
2021-01-27 21:15:32 +01:00
|
|
|
extra_args: [
|
2021-02-04 16:04:15 +01:00
|
|
|
'-DG_LOG_DOMAIN="libnm"',
|
|
|
|
|
'-DNETWORKMANAGER_COMPILATION',
|
2021-01-27 21:15:32 +01:00
|
|
|
],
|
2018-10-18 12:50:20 +02:00
|
|
|
install: true,
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
|
|
|
|
|
docs: add more nm-settings manpages (dbus,nmcli,keyfile,ifcfg-rh)
A significant part of NetworkManager's API are the connection profiles, documented
in `man nm-settings*`. But there are different aspects about profiles, depending
on what you are interested. There is the D-Bus API, nmcli options, keyfile format,
and ifcfg-rh format. Additionally, there is also libnm API.
Add distinct manual pages for the four aspects. Currently the two new manual
pages "nm-settings-dbus" and "nm-settings-nmcli" are still identical to the
former "nm-settings.5" manual. In the future, they will diverge to
account for the differences.
There are the following aspects:
- "dbus"
- "keyfile"
- "ifcfg-rh"
- "nmcli"
For "libnm" we don't generate a separate "nm-settings-libnm" manual
page. That is instead documented via gtk-doc.
Currently the keyfile and ifcfg-rh manual pages only detail settings
which differ. But later I think also these manual pages should contain
all settings that apply.
2020-06-02 19:24:12 +02:00
|
|
|
infos = [ 'dbus', 'nmcli', 'keyfile' ]
|
2017-11-25 11:39:06 +01:00
|
|
|
if enable_ifcfg_rh
|
2020-05-28 13:51:56 +02:00
|
|
|
infos += [ 'ifcfg-rh' ]
|
|
|
|
|
endif
|
|
|
|
|
foreach info: infos
|
|
|
|
|
t = custom_target(
|
|
|
|
|
'nm-propery-infos-' + info + '.xml',
|
2017-12-15 14:35:31 +01:00
|
|
|
input: libnm_core_settings_sources,
|
2020-05-28 13:51:56 +02:00
|
|
|
output: 'nm-propery-infos-' + info + '.xml',
|
|
|
|
|
command: [
|
|
|
|
|
perl,
|
2020-06-09 23:22:34 +02:00
|
|
|
join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.pl'),
|
2020-05-28 13:51:56 +02:00
|
|
|
info,
|
|
|
|
|
'@OUTPUT@',
|
|
|
|
|
'@INPUT@'
|
|
|
|
|
],
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
2020-05-28 13:51:56 +02:00
|
|
|
|
|
|
|
|
# meson 0.47 doesn't support non-static keys for dicts
|
|
|
|
|
# nor extending dicts incrementally. Workaround.
|
|
|
|
|
if info == 'dbus'
|
|
|
|
|
nm_property_infos_xml_dbus = t
|
|
|
|
|
elif info == 'keyfile'
|
|
|
|
|
nm_property_infos_xml_keyfile = t
|
|
|
|
|
elif info == 'ifcfg-rh'
|
|
|
|
|
nm_property_infos_xml_ifcfg_rh = t
|
docs: add more nm-settings manpages (dbus,nmcli,keyfile,ifcfg-rh)
A significant part of NetworkManager's API are the connection profiles, documented
in `man nm-settings*`. But there are different aspects about profiles, depending
on what you are interested. There is the D-Bus API, nmcli options, keyfile format,
and ifcfg-rh format. Additionally, there is also libnm API.
Add distinct manual pages for the four aspects. Currently the two new manual
pages "nm-settings-dbus" and "nm-settings-nmcli" are still identical to the
former "nm-settings.5" manual. In the future, they will diverge to
account for the differences.
There are the following aspects:
- "dbus"
- "keyfile"
- "ifcfg-rh"
- "nmcli"
For "libnm" we don't generate a separate "nm-settings-libnm" manual
page. That is instead documented via gtk-doc.
Currently the keyfile and ifcfg-rh manual pages only detail settings
which differ. But later I think also these manual pages should contain
all settings that apply.
2020-06-02 19:24:12 +02:00
|
|
|
elif info == 'nmcli'
|
|
|
|
|
nm_property_infos_xml_nmcli = t
|
2020-05-28 13:51:56 +02:00
|
|
|
else
|
|
|
|
|
assert(false)
|
|
|
|
|
endif
|
|
|
|
|
endforeach
|
|
|
|
|
if enable_ifcfg_rh
|
|
|
|
|
nm_property_infos_xml = {
|
docs: add more nm-settings manpages (dbus,nmcli,keyfile,ifcfg-rh)
A significant part of NetworkManager's API are the connection profiles, documented
in `man nm-settings*`. But there are different aspects about profiles, depending
on what you are interested. There is the D-Bus API, nmcli options, keyfile format,
and ifcfg-rh format. Additionally, there is also libnm API.
Add distinct manual pages for the four aspects. Currently the two new manual
pages "nm-settings-dbus" and "nm-settings-nmcli" are still identical to the
former "nm-settings.5" manual. In the future, they will diverge to
account for the differences.
There are the following aspects:
- "dbus"
- "keyfile"
- "ifcfg-rh"
- "nmcli"
For "libnm" we don't generate a separate "nm-settings-libnm" manual
page. That is instead documented via gtk-doc.
Currently the keyfile and ifcfg-rh manual pages only detail settings
which differ. But later I think also these manual pages should contain
all settings that apply.
2020-06-02 19:24:12 +02:00
|
|
|
'dbus': nm_property_infos_xml_dbus,
|
|
|
|
|
'keyfile': nm_property_infos_xml_keyfile,
|
|
|
|
|
'nmcli': nm_property_infos_xml_nmcli,
|
2020-05-28 13:51:56 +02:00
|
|
|
'ifcfg-rh': nm_property_infos_xml_ifcfg_rh,
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
nm_property_infos_xml = {
|
docs: add more nm-settings manpages (dbus,nmcli,keyfile,ifcfg-rh)
A significant part of NetworkManager's API are the connection profiles, documented
in `man nm-settings*`. But there are different aspects about profiles, depending
on what you are interested. There is the D-Bus API, nmcli options, keyfile format,
and ifcfg-rh format. Additionally, there is also libnm API.
Add distinct manual pages for the four aspects. Currently the two new manual
pages "nm-settings-dbus" and "nm-settings-nmcli" are still identical to the
former "nm-settings.5" manual. In the future, they will diverge to
account for the differences.
There are the following aspects:
- "dbus"
- "keyfile"
- "ifcfg-rh"
- "nmcli"
For "libnm" we don't generate a separate "nm-settings-libnm" manual
page. That is instead documented via gtk-doc.
Currently the keyfile and ifcfg-rh manual pages only detail settings
which differ. But later I think also these manual pages should contain
all settings that apply.
2020-06-02 19:24:12 +02:00
|
|
|
'dbus': nm_property_infos_xml_dbus,
|
2020-05-28 13:51:56 +02:00
|
|
|
'keyfile': nm_property_infos_xml_keyfile,
|
docs: add more nm-settings manpages (dbus,nmcli,keyfile,ifcfg-rh)
A significant part of NetworkManager's API are the connection profiles, documented
in `man nm-settings*`. But there are different aspects about profiles, depending
on what you are interested. There is the D-Bus API, nmcli options, keyfile format,
and ifcfg-rh format. Additionally, there is also libnm API.
Add distinct manual pages for the four aspects. Currently the two new manual
pages "nm-settings-dbus" and "nm-settings-nmcli" are still identical to the
former "nm-settings.5" manual. In the future, they will diverge to
account for the differences.
There are the following aspects:
- "dbus"
- "keyfile"
- "ifcfg-rh"
- "nmcli"
For "libnm" we don't generate a separate "nm-settings-libnm" manual
page. That is instead documented via gtk-doc.
Currently the keyfile and ifcfg-rh manual pages only detail settings
which differ. But later I think also these manual pages should contain
all settings that apply.
2020-06-02 19:24:12 +02:00
|
|
|
'nmcli': nm_property_infos_xml_nmcli,
|
2020-05-28 13:51:56 +02:00
|
|
|
}
|
2017-11-25 11:39:06 +01:00
|
|
|
endif
|
|
|
|
|
|
2018-06-26 18:14:37 +02:00
|
|
|
gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
|
|
|
|
|
if gi_typelib_path != ''
|
|
|
|
|
gi_typelib_path = ':' + gi_typelib_path
|
|
|
|
|
endif
|
|
|
|
|
gi_typelib_path = meson.current_build_dir() + gi_typelib_path
|
|
|
|
|
|
|
|
|
|
ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH').stdout()
|
|
|
|
|
if ld_library_path != ''
|
|
|
|
|
ld_library_path = ':' + ld_library_path
|
|
|
|
|
endif
|
|
|
|
|
ld_library_path = meson.current_build_dir() + ld_library_path
|
|
|
|
|
|
|
|
|
|
generate_setting_docs_env = [
|
2020-04-25 20:36:57 +02:00
|
|
|
'env',
|
2018-06-26 18:14:37 +02:00
|
|
|
'GI_TYPELIB_PATH=' + gi_typelib_path,
|
2018-10-18 12:50:20 +02:00
|
|
|
'LD_LIBRARY_PATH=' + ld_library_path,
|
2018-06-26 18:14:37 +02:00
|
|
|
]
|
|
|
|
|
|
2020-05-28 19:09:12 +02:00
|
|
|
nm_settings_docs_xml_gir = custom_target(
|
|
|
|
|
'nm-settings-docs-gir.xml',
|
2017-11-25 11:39:06 +01:00
|
|
|
input: libnm_gir[0],
|
2020-05-28 19:09:12 +02:00
|
|
|
output: 'nm-settings-docs-gir.xml',
|
docs: merge settings docs in a separate step
The script "libnm/generate-setting-docs.py" generates property info based
on GObject introspection data.
Optionally, when creating the manual for D-Bus documentation, it would accept
an argument "--override" to merge the generated information with the information
from an XML generated by "libnm/generate-plugin-docs.xml". Change this.
Instead, let "libnm/generate-setting-docs.py" just do one thing: generate
the XML based on GObject introspection data. Then, a second script
"libnm/generate-docs-nm-settings-docs-merge.py" can merge the XMLs.
Note that currently the manual for "nm-settings-keyfile" only contains
information about properties that are explicitly mentioned for keyfile.
It think that is not right. In NetworkManager there are multiple "aspects"
about connection profiles: D-Bus, libnm, nmcli, keyfile and ifcfg-rh.
When we generate a manual page for any of these aspects, we should always
detail all properties. At least for nmcli and D-Bus. That means, we will
do the merging multiple times. Hence, keep the steps for parsing GObject
introspection data and the merging separate.
Also, "generate-setting-docs.py" and "generate-plugin-docs.pl" should
generate the same XML scheme, so that merge doesn't need special hacks.
That is currently not the case, for example, the override XML contains a
"format" attribute, while the other one contains a "type". Merging these
is a special hack. This should be unified.
2020-05-28 10:19:21 +02:00
|
|
|
command: [
|
|
|
|
|
generate_setting_docs_env,
|
|
|
|
|
python.path(),
|
2020-06-09 23:22:34 +02:00
|
|
|
join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
|
docs: merge settings docs in a separate step
The script "libnm/generate-setting-docs.py" generates property info based
on GObject introspection data.
Optionally, when creating the manual for D-Bus documentation, it would accept
an argument "--override" to merge the generated information with the information
from an XML generated by "libnm/generate-plugin-docs.xml". Change this.
Instead, let "libnm/generate-setting-docs.py" just do one thing: generate
the XML based on GObject introspection data. Then, a second script
"libnm/generate-docs-nm-settings-docs-merge.py" can merge the XMLs.
Note that currently the manual for "nm-settings-keyfile" only contains
information about properties that are explicitly mentioned for keyfile.
It think that is not right. In NetworkManager there are multiple "aspects"
about connection profiles: D-Bus, libnm, nmcli, keyfile and ifcfg-rh.
When we generate a manual page for any of these aspects, we should always
detail all properties. At least for nmcli and D-Bus. That means, we will
do the merging multiple times. Hence, keep the steps for parsing GObject
introspection data and the merging separate.
Also, "generate-setting-docs.py" and "generate-plugin-docs.pl" should
generate the same XML scheme, so that merge doesn't need special hacks.
That is currently not the case, for example, the override XML contains a
"format" attribute, while the other one contains a "type". Merging these
is a special hack. This should be unified.
2020-05-28 10:19:21 +02:00
|
|
|
'--lib-path', meson.current_build_dir(),
|
|
|
|
|
'--gir', '@INPUT@',
|
|
|
|
|
'--output', '@OUTPUT@'
|
|
|
|
|
],
|
2018-10-18 12:50:20 +02:00
|
|
|
depends: libnm_gir,
|
2017-11-25 11:39:06 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2019-12-06 13:40:39 +01:00
|
|
|
libnm_libnm_aux = static_library(
|
|
|
|
|
'nm-libnm-aux',
|
2020-06-09 18:06:15 +02:00
|
|
|
sources: files(
|
|
|
|
|
'nm-libnm-aux/nm-libnm-aux.c',
|
|
|
|
|
),
|
2019-12-06 13:40:39 +01:00
|
|
|
c_args: [
|
2021-02-04 11:05:19 +01:00
|
|
|
'-DG_LOG_DOMAIN="libnmc"',
|
2019-12-06 13:40:39 +01:00
|
|
|
],
|
|
|
|
|
dependencies: [
|
|
|
|
|
libnm_core_nm_default_dep,
|
2020-02-21 12:09:18 +01:00
|
|
|
libnm_libnm_core_intern_dep,
|
2019-12-06 13:40:39 +01:00
|
|
|
libnm_dep,
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
libnm_libnm_aux_dep = declare_dependency(
|
|
|
|
|
include_directories: [shared_inc],
|
|
|
|
|
link_with: [libnm_libnm_aux],
|
|
|
|
|
)
|
2021-01-27 21:15:32 +01:00
|
|
|
|
|
|
|
|
if enable_tests
|
|
|
|
|
subdir('tests')
|
|
|
|
|
endif
|