mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-01 13:55:36 +00:00
nmcli: rename "generate-docs-nm-settings-nmcli" to "gen-metadata-nm-settings-nmcli"
This is the better name, becuse this is not in particular about "docs". It's about generating an XML with the information from the settings meta data for nmcli. We will do something similar with the libnm-core meta data.
This commit is contained in:
Thomas Haller
parent
139f4b4b2e
commit
1bfe908c2e
12
.gitignore
vendored
12
.gitignore
vendored
|
|
@ -176,8 +176,8 @@ test-*.trs
|
|||
/src/nm-cloud-setup/tests/test-cloud-setup-general
|
||||
|
||||
/src/nmcli/nmcli
|
||||
/src/nmcli/generate-docs-nm-settings-nmcli
|
||||
/src/nmcli/generate-docs-nm-settings-nmcli.xml
|
||||
/src/nmcli/gen-metadata-nm-settings-nmcli
|
||||
/src/nmcli/gen-metadata-nm-settings-nmcli.xml
|
||||
|
||||
/src/nm-online/nm-online
|
||||
|
||||
|
|
@ -341,6 +341,7 @@ test-*.trs
|
|||
/include/
|
||||
/initscript/*/[Nn]etwork[Mm]anager
|
||||
/initscript/Slackware/rc.networkmanager
|
||||
/intltool-*
|
||||
/introspection/nmdbus-*.c
|
||||
/introspection/nmdbus-*.h
|
||||
/introspection/nmdbus-*.xml
|
||||
|
|
@ -393,7 +394,9 @@ test-*.trs
|
|||
/libnm/tests/test-nm-client
|
||||
/libnm/tests/test-remote-settings-client
|
||||
/libnm/tests/test-secret-agent
|
||||
/m4/intltool.m4
|
||||
/man/nm-settings.xml
|
||||
/po/.intltool-merge-cache
|
||||
/policy/org.freedesktop.NetworkManager.policy
|
||||
/policy/org.freedesktop.NetworkManager.policy.in
|
||||
/shared/nm-glib-aux/tests/test-json-aux
|
||||
|
|
@ -439,6 +442,8 @@ test-*.trs
|
|||
/src/nm-priv-helper/org.freedesktop.nm-priv-helper.service
|
||||
/src/nm-sudo/nm-sudo
|
||||
/src/nm-sudo/org.freedesktop.nm.sudo.service
|
||||
/src/nmcli/generate-docs-nm-settings-nmcli
|
||||
/src/nmcli/generate-docs-nm-settings-nmcli.xml
|
||||
/src/platform/tests/dump
|
||||
/src/platform/tests/monitor
|
||||
/src/platform/tests/platform
|
||||
|
|
@ -482,6 +487,3 @@ test-*.trs
|
|||
/src/tests/test-systemd
|
||||
/src/tests/test-utils
|
||||
/src/tests/test-wired-defname
|
||||
/intltool-*
|
||||
/m4/intltool.m4
|
||||
/po/.intltool-merge-cache
|
||||
|
|
|
|||
38
Makefile.am
38
Makefile.am
|
|
@ -1982,7 +1982,7 @@ src/libnm-client-impl/libnm.typelib: src/libnm-client-impl/libnm.gir
|
|||
INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir
|
||||
|
||||
libnm_noinst_data = \
|
||||
src/nmcli/generate-docs-nm-settings-nmcli.xml \
|
||||
src/nmcli/gen-metadata-nm-settings-nmcli.xml \
|
||||
man/nm-settings-docs-dbus.xml \
|
||||
man/nm-settings-docs-nmcli.xml \
|
||||
src/libnm-client-impl/nm-property-infos-dbus.xml \
|
||||
|
|
@ -1995,19 +1995,19 @@ libnm_noinst_data = \
|
|||
|
||||
noinst_DATA += $(libnm_noinst_data)
|
||||
|
||||
EXTRA_DIST += src/nmcli/generate-docs-nm-settings-nmcli.xml.in
|
||||
EXTRA_DIST += src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
|
||||
|
||||
if BUILD_DOCS
|
||||
src/nmcli/generate-docs-nm-settings-nmcli.xml: src/nmcli/generate-docs-nm-settings-nmcli
|
||||
$(AM_V_GEN) src/nmcli/generate-docs-nm-settings-nmcli > "$@"
|
||||
check-local-generate-docs-nm-settings-nmcli: src/nmcli/generate-docs-nm-settings-nmcli.xml
|
||||
$(srcdir)/tools/check-compare-generated.sh "$(srcdir)/src/nmcli/generate-docs-nm-settings-nmcli.xml.in" "$(builddir)/src/nmcli/generate-docs-nm-settings-nmcli.xml"
|
||||
check_local += check-local-generate-docs-nm-settings-nmcli
|
||||
DISTCLEANFILES += src/nmcli/generate-docs-nm-settings-nmcli.xml
|
||||
src/nmcli/gen-metadata-nm-settings-nmcli.xml: src/nmcli/gen-metadata-nm-settings-nmcli
|
||||
$(AM_V_GEN) src/nmcli/gen-metadata-nm-settings-nmcli > "$@"
|
||||
check-local-gen-metadata-nm-settings-nmcli: src/nmcli/gen-metadata-nm-settings-nmcli.xml
|
||||
$(srcdir)/tools/check-compare-generated.sh "$(srcdir)/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in" "$(builddir)/src/nmcli/gen-metadata-nm-settings-nmcli.xml"
|
||||
check_local += check-local-gen-metadata-nm-settings-nmcli
|
||||
DISTCLEANFILES += src/nmcli/gen-metadata-nm-settings-nmcli.xml
|
||||
else
|
||||
src/nmcli/generate-docs-nm-settings-nmcli.xml: src/nmcli/generate-docs-nm-settings-nmcli.xml.in
|
||||
src/nmcli/gen-metadata-nm-settings-nmcli.xml: src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
|
||||
$(AM_V_GEN) cp $^ $@
|
||||
check-local-generate-docs-nm-settings-nmcli:
|
||||
check-local-gen-metadata-nm-settings-nmcli:
|
||||
endif
|
||||
|
||||
libnm_docs_sources = $(src_libnm_core_impl_lib_c_settings_real)
|
||||
|
|
@ -2030,7 +2030,7 @@ src/libnm-client-impl/nm-settings-docs-gir.xml: tools/generate-docs-nm-settings-
|
|||
--gir $(builddir)/src/libnm-client-impl/NM-1.0.gir \
|
||||
--output $@
|
||||
|
||||
man/nm-settings-docs-nmcli.xml: src/nmcli/generate-docs-nm-settings-nmcli.xml src/libnm-client-impl/nm-property-infos-nmcli.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent
|
||||
man/nm-settings-docs-nmcli.xml: src/nmcli/gen-metadata-nm-settings-nmcli.xml src/libnm-client-impl/nm-property-infos-nmcli.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent
|
||||
$(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py --only-from-first $@ $(wordlist 1,3,$^)
|
||||
|
||||
src/libnmc-setting/settings-docs-input.xml: src/libnm-client-impl/nm-property-infos-nmcli.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py
|
||||
|
|
@ -4973,17 +4973,17 @@ endif
|
|||
|
||||
###############################################################################
|
||||
|
||||
noinst_PROGRAMS += src/nmcli/generate-docs-nm-settings-nmcli
|
||||
noinst_PROGRAMS += src/nmcli/gen-metadata-nm-settings-nmcli
|
||||
|
||||
src_nmcli_generate_docs_nm_settings_nmcli_SOURCES = \
|
||||
src/nmcli/generate-docs-nm-settings-nmcli.c \
|
||||
src_nmcli_gen_metadata_nm_settings_nmcli_SOURCES = \
|
||||
src/nmcli/gen-metadata-nm-settings-nmcli.c \
|
||||
$(NULL)
|
||||
|
||||
src_nmcli_generate_docs_nm_settings_nmcli_CPPFLAGS = \
|
||||
src_nmcli_gen_metadata_nm_settings_nmcli_CPPFLAGS = \
|
||||
$(clients_cppflags) \
|
||||
$(NULL)
|
||||
|
||||
src_nmcli_generate_docs_nm_settings_nmcli_LDADD = \
|
||||
src_nmcli_gen_metadata_nm_settings_nmcli_LDADD = \
|
||||
src/libnmc-setting/libnmc-setting.la \
|
||||
src/libnmc-base/libnmc-base.la \
|
||||
src/libnm-client-aux-extern/libnm-client-aux-extern.la \
|
||||
|
|
@ -4998,13 +4998,13 @@ src_nmcli_generate_docs_nm_settings_nmcli_LDADD = \
|
|||
$(GLIB_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
src_nmcli_generate_docs_nm_settings_nmcli_LDFLAGS = \
|
||||
src_nmcli_gen_metadata_nm_settings_nmcli_LDFLAGS = \
|
||||
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
||||
$(SANITIZER_EXEC_LDFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
$(src_nmcli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
$(src_nmcli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h)
|
||||
$(src_nmcli_gen_metadata_nm_settings_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
$(src_nmcli_gen_metadata_nm_settings_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h)
|
||||
|
||||
###############################################################################
|
||||
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ if enable_introspection
|
|||
join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'),
|
||||
'--only-from-first',
|
||||
'@OUTPUT@',
|
||||
generate_docs_nm_settings_nmcli_xml,
|
||||
gen_metadata_nm_settings_nmcli_xml,
|
||||
nm_property_infos_xml[name],
|
||||
nm_settings_docs_xml_gir,
|
||||
],
|
||||
|
|
|
|||
|
|
@ -45,10 +45,10 @@ executable(
|
|||
|
||||
endif
|
||||
|
||||
generate_docs_nm_settings_nmcli = executable(
|
||||
'generate-docs-nm-settings-nmcli',
|
||||
gen_metadata_nm_settings_nmcli = executable(
|
||||
'gen-metadata-nm-settings-nmcli',
|
||||
files(
|
||||
'generate-docs-nm-settings-nmcli.c',
|
||||
'gen-metadata-nm-settings-nmcli.c',
|
||||
),
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
|
|
@ -70,24 +70,24 @@ generate_docs_nm_settings_nmcli = executable(
|
|||
)
|
||||
|
||||
if enable_docs
|
||||
generate_docs_nm_settings_nmcli_xml = custom_target(
|
||||
'generate-docs-nm-settings-nmcli.xml',
|
||||
output: 'generate-docs-nm-settings-nmcli.xml',
|
||||
command: [ generate_docs_nm_settings_nmcli ],
|
||||
gen_metadata_nm_settings_nmcli_xml = custom_target(
|
||||
'gen-metadata-nm-settings-nmcli.xml',
|
||||
output: 'gen-metadata-nm-settings-nmcli.xml',
|
||||
command: [ gen_metadata_nm_settings_nmcli ],
|
||||
capture: true,
|
||||
)
|
||||
|
||||
test(
|
||||
'check-local-generate-docs-nm-settings-nmcli',
|
||||
'check-local-gen-metadata-nm-settings-nmcli',
|
||||
find_program(join_paths(source_root, 'tools', 'check-compare-generated.sh')),
|
||||
args: [
|
||||
source_root + '/src/nmcli/generate-docs-nm-settings-nmcli.xml.in',
|
||||
generate_docs_nm_settings_nmcli_xml,
|
||||
source_root + '/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in',
|
||||
gen_metadata_nm_settings_nmcli_xml,
|
||||
],
|
||||
)
|
||||
else
|
||||
gen_metadata_nm_settings_nmcli_xml = configure_file(
|
||||
input: 'generate-docs-nm-settings-nmcli.xml.in',
|
||||
input: 'gen-metadata-nm-settings-nmcli.xml.in',
|
||||
output: '@BASENAME@',
|
||||
configuration: configuration_data(),
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue