mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-23 19:24:38 +00:00
cli: move from "clients/cli/" to "src/nmcli/"
This commit is contained in:
parent
71f0511b1f
commit
61f99307c6
11
.gitignore
vendored
11
.gitignore
vendored
|
@ -68,7 +68,6 @@ test-*.trs
|
||||||
/src/nm-dispatcher/org.freedesktop.nm_dispatcher.service
|
/src/nm-dispatcher/org.freedesktop.nm_dispatcher.service
|
||||||
/src/nm-dispatcher/tests/test-dispatcher-envp
|
/src/nm-dispatcher/tests/test-dispatcher-envp
|
||||||
|
|
||||||
/clients/cli/nmcli
|
|
||||||
/clients/tui/nmtui
|
/clients/tui/nmtui
|
||||||
|
|
||||||
/data/NetworkManager.service
|
/data/NetworkManager.service
|
||||||
|
@ -168,10 +167,11 @@ test-*.trs
|
||||||
/src/nm-cloud-setup/nm-cloud-setup.service
|
/src/nm-cloud-setup/nm-cloud-setup.service
|
||||||
/src/nm-cloud-setup/tests/test-cloud-setup-general
|
/src/nm-cloud-setup/tests/test-cloud-setup-general
|
||||||
|
|
||||||
/src/nm-online/nm-online
|
/src/nmcli/nmcli
|
||||||
|
/src/nmcli/generate-docs-nm-settings-nmcli
|
||||||
|
/src/nmcli/generate-docs-nm-settings-nmcli.xml
|
||||||
|
|
||||||
/clients/cli/generate-docs-nm-settings-nmcli
|
/src/nm-online/nm-online
|
||||||
/clients/cli/generate-docs-nm-settings-nmcli.xml
|
|
||||||
|
|
||||||
/m4/codeset.m4
|
/m4/codeset.m4
|
||||||
/m4/gettext.m4
|
/m4/gettext.m4
|
||||||
|
@ -287,6 +287,9 @@ test-*.trs
|
||||||
/callouts/nmdbus-dispatcher.*
|
/callouts/nmdbus-dispatcher.*
|
||||||
/callouts/org.freedesktop.nm_dispatcher.service
|
/callouts/org.freedesktop.nm_dispatcher.service
|
||||||
/callouts/tests/test-dispatcher-envp
|
/callouts/tests/test-dispatcher-envp
|
||||||
|
/clients/cli/generate-docs-nm-settings-nmcli
|
||||||
|
/clients/cli/generate-docs-nm-settings-nmcli.xml
|
||||||
|
/clients/cli/nmcli
|
||||||
/clients/cli/settings-docs.c
|
/clients/cli/settings-docs.c
|
||||||
/clients/cloud-setup/nm-cloud-setup
|
/clients/cloud-setup/nm-cloud-setup
|
||||||
/clients/cloud-setup/nm-cloud-setup.service
|
/clients/cloud-setup/nm-cloud-setup.service
|
||||||
|
|
93
Makefile.am
93
Makefile.am
|
@ -1850,7 +1850,7 @@ src/libnm-client-impl/libnm.typelib: src/libnm-client-impl/libnm.gir
|
||||||
INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir
|
INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir
|
||||||
|
|
||||||
libnm_noinst_data = \
|
libnm_noinst_data = \
|
||||||
clients/cli/generate-docs-nm-settings-nmcli.xml \
|
src/nmcli/generate-docs-nm-settings-nmcli.xml \
|
||||||
man/nm-settings-docs-dbus.xml \
|
man/nm-settings-docs-dbus.xml \
|
||||||
man/nm-settings-docs-nmcli.xml \
|
man/nm-settings-docs-nmcli.xml \
|
||||||
src/libnm-client-impl/nm-property-infos-dbus.xml \
|
src/libnm-client-impl/nm-property-infos-dbus.xml \
|
||||||
|
@ -1863,17 +1863,17 @@ libnm_noinst_data = \
|
||||||
|
|
||||||
noinst_DATA += $(libnm_noinst_data)
|
noinst_DATA += $(libnm_noinst_data)
|
||||||
|
|
||||||
EXTRA_DIST += clients/cli/generate-docs-nm-settings-nmcli.xml.in
|
EXTRA_DIST += src/nmcli/generate-docs-nm-settings-nmcli.xml.in
|
||||||
|
|
||||||
if BUILD_DOCS
|
if BUILD_DOCS
|
||||||
clients/cli/generate-docs-nm-settings-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli
|
src/nmcli/generate-docs-nm-settings-nmcli.xml: src/nmcli/generate-docs-nm-settings-nmcli
|
||||||
$(AM_V_GEN) clients/cli/generate-docs-nm-settings-nmcli > "$@"
|
$(AM_V_GEN) src/nmcli/generate-docs-nm-settings-nmcli > "$@"
|
||||||
check-local-generate-docs-nm-settings-nmcli: clients/cli/generate-docs-nm-settings-nmcli.xml
|
check-local-generate-docs-nm-settings-nmcli: src/nmcli/generate-docs-nm-settings-nmcli.xml
|
||||||
$(srcdir)/tools/check-compare-generated.sh "$(srcdir)" "$(builddir)" "$<"
|
$(srcdir)/tools/check-compare-generated.sh "$(srcdir)" "$(builddir)" "$<"
|
||||||
check_local += check-local-generate-docs-nm-settings-nmcli
|
check_local += check-local-generate-docs-nm-settings-nmcli
|
||||||
DISTCLEANFILES += clients/cli/generate-docs-nm-settings-nmcli.xml
|
DISTCLEANFILES += src/nmcli/generate-docs-nm-settings-nmcli.xml
|
||||||
else
|
else
|
||||||
clients/cli/generate-docs-nm-settings-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli.xml.in
|
src/nmcli/generate-docs-nm-settings-nmcli.xml: src/nmcli/generate-docs-nm-settings-nmcli.xml.in
|
||||||
$(AM_V_GEN) cp $^ $@
|
$(AM_V_GEN) cp $^ $@
|
||||||
check-local-generate-docs-nm-settings-nmcli:
|
check-local-generate-docs-nm-settings-nmcli:
|
||||||
endif
|
endif
|
||||||
|
@ -1893,7 +1893,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 \
|
--gir $(builddir)/src/libnm-client-impl/NM-1.0.gir \
|
||||||
--output $@
|
--output $@
|
||||||
|
|
||||||
man/nm-settings-docs-nmcli.xml: clients/cli/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/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
|
||||||
$(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py --only-from-first $@ $(wordlist 1,3,$^)
|
$(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
|
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
|
||||||
|
@ -4737,38 +4737,37 @@ EXTRA_DIST += \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# clients/cli
|
# src/nmcli
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
if BUILD_NMCLI
|
if BUILD_NMCLI
|
||||||
|
|
||||||
bin_PROGRAMS += clients/cli/nmcli
|
bin_PROGRAMS += src/nmcli/nmcli
|
||||||
|
|
||||||
clients_cli_nmcli_SOURCES = \
|
src_nmcli_nmcli_SOURCES = \
|
||||||
clients/cli/common.c \
|
src/nmcli/common.c \
|
||||||
clients/cli/common.h \
|
src/nmcli/common.h \
|
||||||
clients/cli/utils.c \
|
src/nmcli/utils.c \
|
||||||
clients/cli/utils.h \
|
src/nmcli/utils.h \
|
||||||
clients/cli/agent.c \
|
src/nmcli/agent.c \
|
||||||
clients/cli/general.c \
|
src/nmcli/general.c \
|
||||||
clients/cli/connections.c \
|
src/nmcli/connections.c \
|
||||||
clients/cli/connections.h \
|
src/nmcli/connections.h \
|
||||||
clients/cli/devices.c \
|
src/nmcli/devices.c \
|
||||||
clients/cli/devices.h \
|
src/nmcli/devices.h \
|
||||||
clients/cli/settings.c \
|
src/nmcli/settings.c \
|
||||||
clients/cli/settings.h \
|
src/nmcli/settings.h \
|
||||||
clients/cli/nmcli.c \
|
src/nmcli/nmcli.c \
|
||||||
clients/cli/nmcli.h \
|
src/nmcli/nmcli.h \
|
||||||
clients/cli/polkit-agent.c \
|
src/nmcli/polkit-agent.c \
|
||||||
clients/cli/polkit-agent.h \
|
src/nmcli/polkit-agent.h \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
clients_cli_nmcli_CPPFLAGS = \
|
src_nmcli_nmcli_CPPFLAGS = \
|
||||||
-I$(srcdir)/clients/cli \
|
|
||||||
$(clients_cppflags) \
|
$(clients_cppflags) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
clients_cli_nmcli_LDADD = \
|
src_nmcli_nmcli_LDADD = \
|
||||||
src/libnmc-setting/libnmc-setting.la \
|
src/libnmc-setting/libnmc-setting.la \
|
||||||
src/libnmc-base/libnmc-base.la \
|
src/libnmc-base/libnmc-base.la \
|
||||||
src/libnm-core-aux-extern/libnm-core-aux-extern.la \
|
src/libnm-core-aux-extern/libnm-core-aux-extern.la \
|
||||||
|
@ -4782,16 +4781,16 @@ clients_cli_nmcli_LDADD = \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
$(READLINE_LIBS)
|
$(READLINE_LIBS)
|
||||||
|
|
||||||
clients_cli_nmcli_LDFLAGS = \
|
src_nmcli_nmcli_LDFLAGS = \
|
||||||
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
||||||
$(SANITIZER_EXEC_LDFLAGS)
|
$(SANITIZER_EXEC_LDFLAGS)
|
||||||
|
|
||||||
$(clients_cli_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
$(src_nmcli_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||||
$(clients_cli_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h)
|
$(src_nmcli_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h)
|
||||||
|
|
||||||
install-data-hook-nmcli:
|
install-data-hook-nmcli:
|
||||||
$(mkinstalldirs) $(DESTDIR)$(completiondir)
|
$(mkinstalldirs) $(DESTDIR)$(completiondir)
|
||||||
$(INSTALL_DATA) $(srcdir)/clients/cli/nmcli-completion $(DESTDIR)$(completiondir)/nmcli
|
$(INSTALL_DATA) $(srcdir)/src/nmcli/nmcli-completion $(DESTDIR)$(completiondir)/nmcli
|
||||||
|
|
||||||
install_data_hook += install-data-hook-nmcli
|
install_data_hook += install-data-hook-nmcli
|
||||||
|
|
||||||
|
@ -4804,17 +4803,17 @@ endif
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
noinst_PROGRAMS += clients/cli/generate-docs-nm-settings-nmcli
|
noinst_PROGRAMS += src/nmcli/generate-docs-nm-settings-nmcli
|
||||||
|
|
||||||
clients_cli_generate_docs_nm_settings_nmcli_SOURCES = \
|
src_nmcli_generate_docs_nm_settings_nmcli_SOURCES = \
|
||||||
clients/cli/generate-docs-nm-settings-nmcli.c \
|
src/nmcli/generate-docs-nm-settings-nmcli.c \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
clients_cli_generate_docs_nm_settings_nmcli_CPPFLAGS = \
|
src_nmcli_generate_docs_nm_settings_nmcli_CPPFLAGS = \
|
||||||
$(clients_cppflags) \
|
$(clients_cppflags) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
clients_cli_generate_docs_nm_settings_nmcli_LDADD = \
|
src_nmcli_generate_docs_nm_settings_nmcli_LDADD = \
|
||||||
src/libnmc-setting/libnmc-setting.la \
|
src/libnmc-setting/libnmc-setting.la \
|
||||||
src/libnmc-base/libnmc-base.la \
|
src/libnmc-base/libnmc-base.la \
|
||||||
src/libnm-client-aux-extern/libnm-client-aux-extern.la \
|
src/libnm-client-aux-extern/libnm-client-aux-extern.la \
|
||||||
|
@ -4828,19 +4827,19 @@ clients_cli_generate_docs_nm_settings_nmcli_LDADD = \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
clients_cli_generate_docs_nm_settings_nmcli_LDFLAGS = \
|
src_nmcli_generate_docs_nm_settings_nmcli_LDFLAGS = \
|
||||||
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
||||||
$(SANITIZER_EXEC_LDFLAGS) \
|
$(SANITIZER_EXEC_LDFLAGS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
$(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
$(src_nmcli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||||
$(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h)
|
$(src_nmcli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
clients/cli/nmcli-completion \
|
src/nmcli/nmcli-completion \
|
||||||
clients/cli/meson.build \
|
src/nmcli/meson.build \
|
||||||
src/libnmc-setting/settings-docs.xsl \
|
src/libnmc-setting/settings-docs.xsl \
|
||||||
src/libnmc-setting/meson.build \
|
src/libnmc-setting/meson.build \
|
||||||
src/libnmc-setting/tests/meson.build
|
src/libnmc-setting/tests/meson.build
|
||||||
|
@ -5185,13 +5184,13 @@ endif
|
||||||
# clients/tests
|
# clients/tests
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-client.py
|
check-local-clients-tests-test-client: src/nmcli/nmcli clients/tests/test-client.py
|
||||||
mkdir -p "$(builddir)/clients/tests/"
|
mkdir -p "$(builddir)/clients/tests/"
|
||||||
"$(builddir)/clients/cli/nmcli" --version
|
"$(builddir)/src/nmcli/nmcli" --version
|
||||||
GI_TYPELIB_PATH="$(abs_builddir)/src/libnm-client-impl$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \
|
GI_TYPELIB_PATH="$(abs_builddir)/src/libnm-client-impl$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \
|
||||||
LD_LIBRARY_PATH="$(abs_builddir)/src/libnm-client-impl/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \
|
LD_LIBRARY_PATH="$(abs_builddir)/src/libnm-client-impl/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \
|
||||||
NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \
|
NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \
|
||||||
NM_TEST_CLIENT_NMCLI_PATH=clients/cli/nmcli \
|
NM_TEST_CLIENT_NMCLI_PATH=src/nmcli/nmcli \
|
||||||
"$(PYTHON)" \
|
"$(PYTHON)" \
|
||||||
$(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \
|
$(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \
|
||||||
cat "$(builddir)/clients/tests/test-client.log"; \
|
cat "$(builddir)/clients/tests/test-client.log"; \
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
subdir('cli')
|
|
||||||
|
|
||||||
if enable_nmtui
|
if enable_nmtui
|
||||||
subdir('tui')
|
subdir('tui')
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -24,14 +24,14 @@ from __future__ import print_function
|
||||||
# # of translations must be installed. In practice, the tests only care about
|
# # of translations must be installed. In practice, the tests only care about
|
||||||
# # Polish (pl) translations.
|
# # Polish (pl) translations.
|
||||||
# # The important part is that translations work. Test
|
# # The important part is that translations work. Test
|
||||||
# # $ LANG=pl_PL.UTF-8 ./clients/cli/nmcli --version
|
# # $ LANG=pl_PL.UTF-8 ./src/nmcli/nmcli --version
|
||||||
# # also ensure that `locale -a` reports the Polish locale.
|
# # also ensure that `locale -a` reports the Polish locale.
|
||||||
# #
|
# #
|
||||||
# # How to get that right depends on your distro. First check that
|
# # How to get that right depends on your distro. First check that
|
||||||
# # `LANG=pl_PL.UTF-8 /usr/bin/nmcli --version` gives you Polish output
|
# # `LANG=pl_PL.UTF-8 /usr/bin/nmcli --version` gives you Polish output
|
||||||
# # and that it works in principle.
|
# # and that it works in principle.
|
||||||
# # Then install NetworkManager in the configured prefix (make install)
|
# # Then install NetworkManager in the configured prefix (make install)
|
||||||
# # and verify that ./clients/cli/nmcli also gives you Polish.
|
# # and verify that ./src/nmcli/nmcli also gives you Polish.
|
||||||
# $ NM_TEST_REGENERATE=1 make check-local-clients-tests-test-client
|
# $ NM_TEST_REGENERATE=1 make check-local-clients-tests-test-client
|
||||||
# # Set NM_TEST_REGENERATE=1 to regenerate all files.
|
# # Set NM_TEST_REGENERATE=1 to regenerate all files.
|
||||||
# $ git diff ... ; git add ...
|
# $ git diff ... ; git add ...
|
||||||
|
@ -408,7 +408,7 @@ class Configuration:
|
||||||
if v is None:
|
if v is None:
|
||||||
try:
|
try:
|
||||||
v = os.path.abspath(
|
v = os.path.abspath(
|
||||||
self.get(ENV_NM_TEST_CLIENT_BUILDDIR) + "/clients/cli/nmcli"
|
self.get(ENV_NM_TEST_CLIENT_BUILDDIR) + "/src/nmcli/nmcli"
|
||||||
)
|
)
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -1,16 +1,6 @@
|
||||||
[encoding: UTF-8]
|
[encoding: UTF-8]
|
||||||
# List of source files containing translatable strings.
|
# List of source files containing translatable strings.
|
||||||
# Please keep this file sorted alphabetically.
|
# Please keep this file sorted alphabetically.
|
||||||
clients/cli/agent.c
|
|
||||||
clients/cli/common.c
|
|
||||||
clients/cli/connections.c
|
|
||||||
clients/cli/devices.c
|
|
||||||
clients/cli/general.c
|
|
||||||
clients/cli/nmcli.c
|
|
||||||
clients/cli/polkit-agent.c
|
|
||||||
clients/cli/settings.c
|
|
||||||
clients/cli/utils.c
|
|
||||||
clients/cli/utils.h
|
|
||||||
clients/tui/nm-editor-utils.c
|
clients/tui/nm-editor-utils.c
|
||||||
clients/tui/nmt-connect-connection-list.c
|
clients/tui/nmt-connect-connection-list.c
|
||||||
clients/tui/nmt-device-entry.c
|
clients/tui/nmt-device-entry.c
|
||||||
|
@ -183,3 +173,13 @@ src/libnmc-setting/nm-meta-setting-desc.c
|
||||||
src/libnmc-setting/settings-docs.h.in
|
src/libnmc-setting/settings-docs.h.in
|
||||||
src/libnmt-newt/nmt-newt-utils.c
|
src/libnmt-newt/nmt-newt-utils.c
|
||||||
src/nm-online/nm-online.c
|
src/nm-online/nm-online.c
|
||||||
|
src/nmcli/agent.c
|
||||||
|
src/nmcli/common.c
|
||||||
|
src/nmcli/connections.c
|
||||||
|
src/nmcli/devices.c
|
||||||
|
src/nmcli/general.c
|
||||||
|
src/nmcli/nmcli.c
|
||||||
|
src/nmcli/polkit-agent.c
|
||||||
|
src/nmcli/settings.c
|
||||||
|
src/nmcli/utils.c
|
||||||
|
src/nmcli/utils.h
|
||||||
|
|
|
@ -90,6 +90,7 @@ subdir('libnmc-setting')
|
||||||
if enable_nmtui
|
if enable_nmtui
|
||||||
subdir('libnmt-newt')
|
subdir('libnmt-newt')
|
||||||
endif
|
endif
|
||||||
|
subdir('nmcli')
|
||||||
subdir('nm-dispatcher')
|
subdir('nm-dispatcher')
|
||||||
subdir('nm-online')
|
subdir('nm-online')
|
||||||
subdir('nm-initrd-generator')
|
subdir('nm-initrd-generator')
|
||||||
|
|
|
@ -2,7 +2,9 @@
|
||||||
|
|
||||||
if enable_nmcli
|
if enable_nmcli
|
||||||
|
|
||||||
# FIXME: nmcli-completion should be renamed to nmcli
|
# The file is called "nmcli-completion" but should be installed with
|
||||||
|
# name "nmcli". Currently it gets renamed by "tools/meson-post-install.sh",
|
||||||
|
# but if we depend on meson 0.46.0, we could use "rename" option.
|
||||||
install_data(
|
install_data(
|
||||||
'nmcli-completion',
|
'nmcli-completion',
|
||||||
install_dir: join_paths(nm_datadir, 'bash-completion', 'completions'),
|
install_dir: join_paths(nm_datadir, 'bash-completion', 'completions'),
|
||||||
|
@ -81,7 +83,7 @@ if enable_docs
|
||||||
args: [
|
args: [
|
||||||
source_root,
|
source_root,
|
||||||
build_root,
|
build_root,
|
||||||
'clients/cli/generate-docs-nm-settings-nmcli.xml',
|
'src/nmcli/generate-docs-nm-settings-nmcli.xml',
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
else
|
else
|
|
@ -31,7 +31,6 @@ build_out_of_tree() {
|
||||||
TARGETS=("$@")
|
TARGETS=("$@")
|
||||||
if [ "${#TARGETS}" -lt 1 ]; then
|
if [ "${#TARGETS}" -lt 1 ]; then
|
||||||
TARGETS=(
|
TARGETS=(
|
||||||
clients/cli/nmcli
|
|
||||||
clients/tui/nmtui
|
clients/tui/nmtui
|
||||||
dispatcher/nm-dispatcher
|
dispatcher/nm-dispatcher
|
||||||
src/core/NetworkManager
|
src/core/NetworkManager
|
||||||
|
@ -40,6 +39,7 @@ if [ "${#TARGETS}" -lt 1 ]; then
|
||||||
src/core/nm-iface-helper
|
src/core/nm-iface-helper
|
||||||
src/core/platform/tests/monitor
|
src/core/platform/tests/monitor
|
||||||
src/nm-online/nm-online
|
src/nm-online/nm-online
|
||||||
|
src/nmcli/nmcli
|
||||||
$(git grep -h '\.l\?a\>' Makefile.am | sed 's/[a-zA-Z.0-9_-/]\+/\n\0\n/g' | sort -u | grep '\.l\?a$')
|
$(git grep -h '\.l\?a\>' Makefile.am | sed 's/[a-zA-Z.0-9_-/]\+/\n\0\n/g' | sort -u | grep '\.l\?a$')
|
||||||
)
|
)
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue