From 61f99307c6ce495be4c9c8d326665ccbd019f4e8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 14 Mar 2021 09:26:51 +0100 Subject: [PATCH] cli: move from "clients/cli/" to "src/nmcli/" --- .gitignore | 11 ++- Makefile.am | 93 +++++++++---------- clients/meson.build | 2 - clients/tests/test-client.py | 6 +- po/POTFILES.in | 20 ++-- src/meson.build | 1 + {clients/cli => src/nmcli}/agent.c | 0 {clients/cli => src/nmcli}/common.c | 0 {clients/cli => src/nmcli}/common.h | 0 {clients/cli => src/nmcli}/connections.c | 0 {clients/cli => src/nmcli}/connections.h | 0 {clients/cli => src/nmcli}/devices.c | 0 {clients/cli => src/nmcli}/devices.h | 0 {clients/cli => src/nmcli}/general.c | 0 .../nmcli}/generate-docs-nm-settings-nmcli.c | 0 .../generate-docs-nm-settings-nmcli.xml.in | 0 {clients/cli => src/nmcli}/meson.build | 6 +- {clients/cli => src/nmcli}/nmcli-completion | 0 {clients/cli => src/nmcli}/nmcli.c | 0 {clients/cli => src/nmcli}/nmcli.h | 0 {clients/cli => src/nmcli}/polkit-agent.c | 0 {clients/cli => src/nmcli}/polkit-agent.h | 0 {clients/cli => src/nmcli}/settings.c | 0 {clients/cli => src/nmcli}/settings.h | 0 {clients/cli => src/nmcli}/utils.c | 0 {clients/cli => src/nmcli}/utils.h | 0 tools/test-build.sh | 2 +- 27 files changed, 72 insertions(+), 69 deletions(-) rename {clients/cli => src/nmcli}/agent.c (100%) rename {clients/cli => src/nmcli}/common.c (100%) rename {clients/cli => src/nmcli}/common.h (100%) rename {clients/cli => src/nmcli}/connections.c (100%) rename {clients/cli => src/nmcli}/connections.h (100%) rename {clients/cli => src/nmcli}/devices.c (100%) rename {clients/cli => src/nmcli}/devices.h (100%) rename {clients/cli => src/nmcli}/general.c (100%) rename {clients/cli => src/nmcli}/generate-docs-nm-settings-nmcli.c (100%) rename {clients/cli => src/nmcli}/generate-docs-nm-settings-nmcli.xml.in (100%) rename {clients/cli => src/nmcli}/meson.build (87%) rename {clients/cli => src/nmcli}/nmcli-completion (100%) rename {clients/cli => src/nmcli}/nmcli.c (100%) rename {clients/cli => src/nmcli}/nmcli.h (100%) rename {clients/cli => src/nmcli}/polkit-agent.c (100%) rename {clients/cli => src/nmcli}/polkit-agent.h (100%) rename {clients/cli => src/nmcli}/settings.c (100%) rename {clients/cli => src/nmcli}/settings.h (100%) rename {clients/cli => src/nmcli}/utils.c (100%) rename {clients/cli => src/nmcli}/utils.h (100%) diff --git a/.gitignore b/.gitignore index afeba62995..ae3d60547f 100644 --- a/.gitignore +++ b/.gitignore @@ -68,7 +68,6 @@ test-*.trs /src/nm-dispatcher/org.freedesktop.nm_dispatcher.service /src/nm-dispatcher/tests/test-dispatcher-envp -/clients/cli/nmcli /clients/tui/nmtui /data/NetworkManager.service @@ -168,10 +167,11 @@ test-*.trs /src/nm-cloud-setup/nm-cloud-setup.service /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 -/clients/cli/generate-docs-nm-settings-nmcli.xml +/src/nm-online/nm-online /m4/codeset.m4 /m4/gettext.m4 @@ -287,6 +287,9 @@ test-*.trs /callouts/nmdbus-dispatcher.* /callouts/org.freedesktop.nm_dispatcher.service /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/cloud-setup/nm-cloud-setup /clients/cloud-setup/nm-cloud-setup.service diff --git a/Makefile.am b/Makefile.am index 9fe93af9d9..aa2a3e3023 100644 --- a/Makefile.am +++ b/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 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-nmcli.xml \ src/libnm-client-impl/nm-property-infos-dbus.xml \ @@ -1863,17 +1863,17 @@ 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 -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 +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)" "$(builddir)" "$<" 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 -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 $^ $@ check-local-generate-docs-nm-settings-nmcli: 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 \ --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,$^) 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) ############################################################################### -# clients/cli +# src/nmcli ############################################################################### if BUILD_NMCLI -bin_PROGRAMS += clients/cli/nmcli +bin_PROGRAMS += src/nmcli/nmcli -clients_cli_nmcli_SOURCES = \ - clients/cli/common.c \ - clients/cli/common.h \ - clients/cli/utils.c \ - clients/cli/utils.h \ - clients/cli/agent.c \ - clients/cli/general.c \ - clients/cli/connections.c \ - clients/cli/connections.h \ - clients/cli/devices.c \ - clients/cli/devices.h \ - clients/cli/settings.c \ - clients/cli/settings.h \ - clients/cli/nmcli.c \ - clients/cli/nmcli.h \ - clients/cli/polkit-agent.c \ - clients/cli/polkit-agent.h \ +src_nmcli_nmcli_SOURCES = \ + src/nmcli/common.c \ + src/nmcli/common.h \ + src/nmcli/utils.c \ + src/nmcli/utils.h \ + src/nmcli/agent.c \ + src/nmcli/general.c \ + src/nmcli/connections.c \ + src/nmcli/connections.h \ + src/nmcli/devices.c \ + src/nmcli/devices.h \ + src/nmcli/settings.c \ + src/nmcli/settings.h \ + src/nmcli/nmcli.c \ + src/nmcli/nmcli.h \ + src/nmcli/polkit-agent.c \ + src/nmcli/polkit-agent.h \ $(NULL) -clients_cli_nmcli_CPPFLAGS = \ - -I$(srcdir)/clients/cli \ +src_nmcli_nmcli_CPPFLAGS = \ $(clients_cppflags) \ $(NULL) -clients_cli_nmcli_LDADD = \ +src_nmcli_nmcli_LDADD = \ src/libnmc-setting/libnmc-setting.la \ src/libnmc-base/libnmc-base.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ @@ -4782,16 +4781,16 @@ clients_cli_nmcli_LDADD = \ $(GLIB_LIBS) \ $(READLINE_LIBS) -clients_cli_nmcli_LDFLAGS = \ +src_nmcli_nmcli_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ $(SANITIZER_EXEC_LDFLAGS) -$(clients_cli_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_cli_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(src_nmcli_nmcli_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_nmcli_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h) install-data-hook-nmcli: $(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 @@ -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 = \ - clients/cli/generate-docs-nm-settings-nmcli.c \ +src_nmcli_generate_docs_nm_settings_nmcli_SOURCES = \ + src/nmcli/generate-docs-nm-settings-nmcli.c \ $(NULL) -clients_cli_generate_docs_nm_settings_nmcli_CPPFLAGS = \ +src_nmcli_generate_docs_nm_settings_nmcli_CPPFLAGS = \ $(clients_cppflags) \ $(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-base/libnmc-base.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) \ $(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" \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -$(clients_cli_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_core_public_mkenums_h) +$(src_nmcli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_client_public_mkenums_h) ############################################################################### EXTRA_DIST += \ - clients/cli/nmcli-completion \ - clients/cli/meson.build \ + src/nmcli/nmcli-completion \ + src/nmcli/meson.build \ src/libnmc-setting/settings-docs.xsl \ src/libnmc-setting/meson.build \ src/libnmc-setting/tests/meson.build @@ -5185,13 +5184,13 @@ endif # 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/" - "$(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}" \ 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_NMCLI_PATH=clients/cli/nmcli \ + NM_TEST_CLIENT_NMCLI_PATH=src/nmcli/nmcli \ "$(PYTHON)" \ $(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \ cat "$(builddir)/clients/tests/test-client.log"; \ diff --git a/clients/meson.build b/clients/meson.build index 2e7ab7cc50..184b7b556d 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -1,7 +1,5 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -subdir('cli') - if enable_nmtui subdir('tui') endif diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 99d9067f72..ed4b63315e 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -24,14 +24,14 @@ from __future__ import print_function # # of translations must be installed. In practice, the tests only care about # # Polish (pl) translations. # # 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. # # # # 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 # # and that it works in principle. # # 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 # # Set NM_TEST_REGENERATE=1 to regenerate all files. # $ git diff ... ; git add ... @@ -408,7 +408,7 @@ class Configuration: if v is None: try: 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: pass diff --git a/po/POTFILES.in b/po/POTFILES.in index 73235c059f..24755e9afa 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,16 +1,6 @@ [encoding: UTF-8] # List of source files containing translatable strings. # 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/nmt-connect-connection-list.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/libnmt-newt/nmt-newt-utils.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 diff --git a/src/meson.build b/src/meson.build index 8b2df8aea1..c7bf5b00bd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -90,6 +90,7 @@ subdir('libnmc-setting') if enable_nmtui subdir('libnmt-newt') endif +subdir('nmcli') subdir('nm-dispatcher') subdir('nm-online') subdir('nm-initrd-generator') diff --git a/clients/cli/agent.c b/src/nmcli/agent.c similarity index 100% rename from clients/cli/agent.c rename to src/nmcli/agent.c diff --git a/clients/cli/common.c b/src/nmcli/common.c similarity index 100% rename from clients/cli/common.c rename to src/nmcli/common.c diff --git a/clients/cli/common.h b/src/nmcli/common.h similarity index 100% rename from clients/cli/common.h rename to src/nmcli/common.h diff --git a/clients/cli/connections.c b/src/nmcli/connections.c similarity index 100% rename from clients/cli/connections.c rename to src/nmcli/connections.c diff --git a/clients/cli/connections.h b/src/nmcli/connections.h similarity index 100% rename from clients/cli/connections.h rename to src/nmcli/connections.h diff --git a/clients/cli/devices.c b/src/nmcli/devices.c similarity index 100% rename from clients/cli/devices.c rename to src/nmcli/devices.c diff --git a/clients/cli/devices.h b/src/nmcli/devices.h similarity index 100% rename from clients/cli/devices.h rename to src/nmcli/devices.h diff --git a/clients/cli/general.c b/src/nmcli/general.c similarity index 100% rename from clients/cli/general.c rename to src/nmcli/general.c diff --git a/clients/cli/generate-docs-nm-settings-nmcli.c b/src/nmcli/generate-docs-nm-settings-nmcli.c similarity index 100% rename from clients/cli/generate-docs-nm-settings-nmcli.c rename to src/nmcli/generate-docs-nm-settings-nmcli.c diff --git a/clients/cli/generate-docs-nm-settings-nmcli.xml.in b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in similarity index 100% rename from clients/cli/generate-docs-nm-settings-nmcli.xml.in rename to src/nmcli/generate-docs-nm-settings-nmcli.xml.in diff --git a/clients/cli/meson.build b/src/nmcli/meson.build similarity index 87% rename from clients/cli/meson.build rename to src/nmcli/meson.build index 708b8aad9b..e2d73534b8 100644 --- a/clients/cli/meson.build +++ b/src/nmcli/meson.build @@ -2,7 +2,9 @@ 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( 'nmcli-completion', install_dir: join_paths(nm_datadir, 'bash-completion', 'completions'), @@ -81,7 +83,7 @@ if enable_docs args: [ source_root, build_root, - 'clients/cli/generate-docs-nm-settings-nmcli.xml', + 'src/nmcli/generate-docs-nm-settings-nmcli.xml', ], ) else diff --git a/clients/cli/nmcli-completion b/src/nmcli/nmcli-completion similarity index 100% rename from clients/cli/nmcli-completion rename to src/nmcli/nmcli-completion diff --git a/clients/cli/nmcli.c b/src/nmcli/nmcli.c similarity index 100% rename from clients/cli/nmcli.c rename to src/nmcli/nmcli.c diff --git a/clients/cli/nmcli.h b/src/nmcli/nmcli.h similarity index 100% rename from clients/cli/nmcli.h rename to src/nmcli/nmcli.h diff --git a/clients/cli/polkit-agent.c b/src/nmcli/polkit-agent.c similarity index 100% rename from clients/cli/polkit-agent.c rename to src/nmcli/polkit-agent.c diff --git a/clients/cli/polkit-agent.h b/src/nmcli/polkit-agent.h similarity index 100% rename from clients/cli/polkit-agent.h rename to src/nmcli/polkit-agent.h diff --git a/clients/cli/settings.c b/src/nmcli/settings.c similarity index 100% rename from clients/cli/settings.c rename to src/nmcli/settings.c diff --git a/clients/cli/settings.h b/src/nmcli/settings.h similarity index 100% rename from clients/cli/settings.h rename to src/nmcli/settings.h diff --git a/clients/cli/utils.c b/src/nmcli/utils.c similarity index 100% rename from clients/cli/utils.c rename to src/nmcli/utils.c diff --git a/clients/cli/utils.h b/src/nmcli/utils.h similarity index 100% rename from clients/cli/utils.h rename to src/nmcli/utils.h diff --git a/tools/test-build.sh b/tools/test-build.sh index 4060aa18f3..6d77dea95d 100755 --- a/tools/test-build.sh +++ b/tools/test-build.sh @@ -31,7 +31,6 @@ build_out_of_tree() { TARGETS=("$@") if [ "${#TARGETS}" -lt 1 ]; then TARGETS=( - clients/cli/nmcli clients/tui/nmtui dispatcher/nm-dispatcher src/core/NetworkManager @@ -40,6 +39,7 @@ if [ "${#TARGETS}" -lt 1 ]; then src/core/nm-iface-helper src/core/platform/tests/monitor 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$') ) fi