summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-11-01 18:28:37 +0100
committerThomas Haller <thaller@redhat.com>2020-11-02 16:42:31 +0100
commit9e1316c267c6eb956db6ac1083c36987e054888e (patch)
treef26f01bb60532b093ae1f607b2e28ab3ccc524d9
parentae1b86fb82674701ce28857061dffb449edd7ea9 (diff)
downloadNetworkManager-th/build-generate-docs.tar.gz
build: rename "tools/check-settings-docs.sh" to "check-compare-generated.sh"th/build-generate-docs
It's a better name, because the script merely compiles files and is not specific to "settings-docs.h".
-rw-r--r--Makefile.am6
-rw-r--r--clients/cli/meson.build2
-rw-r--r--clients/common/meson.build2
-rwxr-xr-xtools/check-compare-generated.sh (renamed from tools/check-settings-docs.sh)0
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index d8ea711eea..c27dbefcc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1604,7 +1604,7 @@ if BUILD_DOCS
clients/cli/generate-docs-nm-settings-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli
$(AM_V_GEN) clients/cli/generate-docs-nm-settings-nmcli > "$@"
check-local-generate-docs-nm-settings-nmcli: clients/cli/generate-docs-nm-settings-nmcli.xml
- $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$<"
+ $(srcdir)/tools/check-compare-generated.sh "$(srcdir)" "$(builddir)" "$<"
check_local += check-local-generate-docs-nm-settings-nmcli
DISTCLEANFILES += clients/cli/generate-docs-nm-settings-nmcli.xml
else
@@ -4462,7 +4462,7 @@ $(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-sett
$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
DISTCLEANFILES += $(clients_common_settings_doc_h)
check-local-settings-docs: $(clients_common_settings_doc_h)
- $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
+ $(srcdir)/tools/check-compare-generated.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
check_local += check-local-settings-docs
else
$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
@@ -5289,7 +5289,7 @@ EXTRA_DIST += \
tools/check-config-options.sh \
tools/check-docs.sh \
tools/check-exports.sh \
- tools/check-settings-docs.sh \
+ tools/check-compare-generated.sh \
tools/create-exports-NetworkManager.sh \
tools/debug-helper.py \
tools/meson-post-install.sh \
diff --git a/clients/cli/meson.build b/clients/cli/meson.build
index 582076bdd0..585a5a7382 100644
--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@@ -60,7 +60,7 @@ if enable_docs
test(
'check-local-generate-docs-nm-settings-nmcli',
- find_program(join_paths(source_root, 'tools', 'check-settings-docs.sh')),
+ find_program(join_paths(source_root, 'tools', 'check-compare-generated.sh')),
args: [source_root, build_root, 'clients/cli/generate-docs-nm-settings-nmcli.xml'],
)
else
diff --git a/clients/common/meson.build b/clients/common/meson.build
index 81fc22d695..0e3f0d4f6f 100644
--- a/clients/common/meson.build
+++ b/clients/common/meson.build
@@ -41,7 +41,7 @@ if enable_docs
test(
'check-settings-docs',
- find_program(join_paths(source_root, 'tools', 'check-settings-docs.sh')),
+ find_program(join_paths(source_root, 'tools', 'check-compare-generated.sh')),
args: [source_root, build_root, 'clients/common/' + settings_docs],
)
else
diff --git a/tools/check-settings-docs.sh b/tools/check-compare-generated.sh
index 44b70f95c6..44b70f95c6 100755
--- a/tools/check-settings-docs.sh
+++ b/tools/check-compare-generated.sh