From df285fbaa9e2bf1a1c6a50cec6b445992223849f Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Wed, 23 Aug 2023 10:25:58 +0200 Subject: [PATCH 1/2] libnm/docs: fix building libnm documentation with meson Currently, the libnm documentation fails to build with meson due to meson replacing backslashes with slashes. This commit introduces a workaround -- replacing the `ignore_decorators` RegEx with an equivalent one that does not use backslashes. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1717 --- docs/libnm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 01c9b66959..770d006284 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -27,7 +27,7 @@ private_headers = [ scan_args = [ '--rebuild-types', '--rebuild-sections', - '--ignore-decorators=NM_AVAILABLE_IN_\d+_\d+|NM_DEPRECATED_IN_\d+_\d+|NM_DEPRECATED_IN_\d+_\d+_FOR\(\)', + '--ignore-decorators=NM_AVAILABLE_IN_[0-9]+_[0-9]+|NM_DEPRECATED_IN_[0-9]+_[0-9]+|NM_DEPRECATED_IN_[0-9]+_[0-9]+_FOR[(][)]', '--ignore-headers=' + ' '.join(private_headers), ] From 848a303d3dc9d5834663d326e121d07f81b4520d Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Tue, 24 Oct 2023 10:29:14 +0200 Subject: [PATCH 2/2] build: add missing source dirs to meson doc build https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1717 --- docs/libnm/meson.build | 2 ++ src/libnm-client-impl/meson.build | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 770d006284..fcc4611dcc 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -43,6 +43,8 @@ gnome.gtkdoc( src_dir: [ libnm_core_public_inc, libnm_client_public_inc, + libnm_core_impl_inc, + libnm_client_impl_inc ], dependencies: libnm_dep, scan_args: scan_args, diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index 0765944808..967565362d 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -1,5 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later +libnm_client_impl_inc = include_directories('.') + libnm_client_impl_sources = files( 'nm-access-point.c', 'nm-active-connection.c',