system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-09 04:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: commit pre-generated "generate-docs-nm-settings-nmcli.xml" to git

Browse Source 
We can generate "generate-docs-nm-settings-nmcli.xml" by running "clients/cli/generate-docs-nm-settings-nmcli".
However, during cross compilation, that binary gets build in the target architecture,
it can thus not run to generate the XML.
This commit is contained in:
Thomas Haller 2020-11-01 17:36:22 +01:00
parent a208da4139
commit ab8fdb73e6
No known key found for this signature in database
GPG Key ID: 29C2366E4DFC5728
3 changed files with 1141 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@ -1602,8 +1602,20 @@ libnm_noinst_data = \
noinst_DATA += $(libnm_noinst_data)
EXTRA_DIST += clients/cli/generate-docs-nm-settings-nmcli.xml.in
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 > $@
$(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)" "$<"
check_local += check-local-generate-docs-nm-settings-nmcli
DISTCLEANFILES += clients/cli/generate-docs-nm-settings-nmcli.xml
else
clients/cli/generate-docs-nm-settings-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli.xml.in
$(AM_V_GEN) cp $^ $@
check-local-generate-docs-nm-settings-nmcli:
endif
libnm_docs_sources = $(libnm_core_lib_c_settings_real)

1108
clients/cli/generate-docs-nm-settings-nmcli.xml.in Normal file
View File

File diff suppressed because it is too large Load Diff

26
clients/cli/meson.build
View File

@ -50,9 +50,23 @@ generate_docs_nm_settings_nmcli = executable(
link_depends: linker_script_binary,
)
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 ],
capture: true,
)
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 ],
capture: true,
)
test(
'check-local-generate-docs-nm-settings-nmcli',
find_program(join_paths(source_root, 'tools', 'check-settings-docs.sh')),
args: [source_root, build_root, 'clients/cli/generate-docs-nm-settings-nmcli.xml'],
)
else
settings_docs_source = configure_file(
input: 'generate-docs-nm-settings-nmcli.xml.in',
output: '@BASENAME@',
configuration: configuration_data(),
)
endif