diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-09-06 11:00:52 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-09-06 14:18:24 +0200 |
| commit | 11cf082a6233a5c2f17da1b49457a66266062678 (patch) | |
| tree | bf0dcc0995f7786cbfb9c5dcf8de1989adb1db65 | |
| parent | a0498e0829f9aa1d51e39b99c235f55b66fe0bc0 (diff) | |
| download | NetworkManager-11cf082a6233a5c2f17da1b49457a66266062678.tar.gz | |
build: use regexp in gtkdoc --ignore-decorators option
gtkdoc-scan supports regular expressions in the --ignore-decorators
command-line option. Since it is easier to use a regexp than grepping
macros from a source file, revert the ugly solution from commit
2d941dc95a1d ('build: fix errors when building with gtk-doc 1.32').
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | docs/libnm/Makefile.am | 4 | ||||
| -rw-r--r-- | docs/libnm/meson.build | 5 | ||||
| -rwxr-xr-x | tools/decorators.sh | 7 |
4 files changed, 2 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 728358e23d..03a35a617b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4800,7 +4800,6 @@ EXTRA_DIST += \ tools/check-settings-docs.sh \ tools/create-exports-NetworkManager.sh \ tools/debug-helper.py \ - tools/decorators.sh \ tools/meson-post-install.sh \ tools/run-nm-test.sh \ tools/test-networkmanager-service.py \ diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index ded32f8218..20dc8de571 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -18,10 +18,8 @@ DOC_SOURCE_DIR= \ $(top_srcdir)/libnm \ $(top_builddir)/libnm -decorators := $(shell $(top_srcdir)/tools/decorators.sh $(top_srcdir)/libnm-core/nm-version.h) - # Extra options to supply to gtkdoc-scan. -SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators "$(decorators)" +SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators="NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?" # Extra options to supply to gtkdoc-mkdb. MKDB_OPTIONS=--sgml-mode --output-format=xml diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 3403b339d7..b4a23729bb 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -32,9 +32,6 @@ configure_file( configuration: version_conf, ) -result = run_command(join_paths(meson.source_root(), 'tools', 'decorators.sh'), - join_paths(meson.source_root(), 'libnm-core', 'nm-version.h')) - gnome.gtkdoc( doc_module, main_xml: doc_module + '-docs.xml', @@ -46,7 +43,7 @@ gnome.gtkdoc( scan_args: [ '--rebuild-types', '--rebuild-sections', - '--ignore-decorators=' + result.stdout().strip(), + '--ignore-decorators=NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?', '--ignore-headers=' + ' '.join(private_headers), ], scanobjs_args: '--type-init-func="g_type_init();"', diff --git a/tools/decorators.sh b/tools/decorators.sh deleted file mode 100755 index 7af7b1e494..0000000000 --- a/tools/decorators.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# Extract NM_DEPRECATED_IN_* and NM_AVAILABLE_IN_* macros from a -# header file and output them in a way suitable to be passed to -# 'gtkdoc-scan --ignore-decorators' - -grep -o "NM_DEPRECATED_IN_[0-9]_[0-9]\+$\|NM_AVAILABLE_IN_[0-9]_[0-9]\+$" "$1" | sed ':a;N;$!ba;s/\n/|/g' |