From 54976f23cd95d11e0f6a39d628458d8ba6308876 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 1 Mar 2021 12:42:48 +0100 Subject: [PATCH] build: move "clients/common/" to "src/libnmc-{base,setting}/" --- .gitignore | 13 +- Makefile.am | 240 +++++++++--------- clients/cli/agent.c | 4 +- clients/cli/common.c | 4 +- clients/cli/common.h | 2 +- clients/cli/connections.c | 8 +- clients/cli/devices.c | 4 +- clients/cli/general.c | 2 +- clients/cli/generate-docs-nm-settings-nmcli.c | 2 +- clients/cli/meson.build | 8 +- clients/cli/nmcli.c | 2 +- clients/cli/nmcli.h | 4 +- clients/cli/polkit-agent.c | 2 +- clients/cli/settings.c | 6 +- clients/cli/settings.h | 2 +- clients/cli/utils.c | 4 +- clients/cloud-setup/meson.build | 6 +- clients/cloud-setup/tests/meson.build | 4 +- clients/common/tests/meson.build | 47 ---- clients/meson.build | 1 - clients/tui/meson.build | 4 +- clients/tui/nm-editor-utils.c | 2 +- clients/tui/nmt-connect-connection-list.c | 2 +- clients/tui/nmt-editor.c | 2 +- clients/tui/nmt-password-dialog.c | 2 +- clients/tui/nmtui-connect.c | 6 +- po/POTFILES.in | 14 +- src/libnm-client-aux-extern/tests/meson.build | 23 ++ .../tests/test-libnm-client-aux.c | 0 src/libnmc-base/meson.build | 15 ++ .../libnmc-base}/nm-client-utils.c | 0 .../libnmc-base}/nm-client-utils.h | 1 - .../libnmc-base}/nm-polkit-listener.c | 0 .../libnmc-base}/nm-polkit-listener.h | 0 .../libnmc-base}/nm-secret-agent-simple.c | 0 .../libnmc-base}/nm-secret-agent-simple.h | 0 .../libnmc-base}/nm-vpn-helpers.c | 0 .../libnmc-base}/nm-vpn-helpers.h | 0 .../common => src/libnmc-base}/qrcodegen.c | 0 .../common => src/libnmc-base}/qrcodegen.h | 0 .../common => src/libnmc-setting}/meson.build | 41 +-- .../libnmc-setting}/nm-meta-setting-access.c | 0 .../libnmc-setting}/nm-meta-setting-access.h | 0 .../nm-meta-setting-base-impl.c | 0 .../nm-meta-setting-base-impl.h | 0 .../libnmc-setting}/nm-meta-setting-base.h | 0 .../libnmc-setting}/nm-meta-setting-desc.c | 6 +- .../libnmc-setting}/nm-meta-setting-desc.h | 0 .../libnmc-setting}/settings-docs.h.in | 0 .../libnmc-setting}/settings-docs.xsl | 0 src/libnmc-setting/tests/meson.build | 26 ++ .../tests/test-libnmc-setting.c | 16 +- .../libnmc-setting}/tests/wg-test0.conf | 0 .../libnmc-setting}/tests/wg-test1.conf | 0 .../libnmc-setting}/tests/wg-test2.conf | 0 .../libnmc-setting}/tests/wg-test3.conf | 0 src/meson.build | 4 + tools/check-tree.sh | 4 +- 58 files changed, 255 insertions(+), 278 deletions(-) delete mode 100644 clients/common/tests/meson.build create mode 100644 src/libnm-client-aux-extern/tests/meson.build rename clients/common/tests/test-libnm-core-aux.c => src/libnm-client-aux-extern/tests/test-libnm-client-aux.c (100%) create mode 100644 src/libnmc-base/meson.build rename {clients/common => src/libnmc-base}/nm-client-utils.c (100%) rename {clients/common => src/libnmc-base}/nm-client-utils.h (98%) rename {clients/common => src/libnmc-base}/nm-polkit-listener.c (100%) rename {clients/common => src/libnmc-base}/nm-polkit-listener.h (100%) rename {clients/common => src/libnmc-base}/nm-secret-agent-simple.c (100%) rename {clients/common => src/libnmc-base}/nm-secret-agent-simple.h (100%) rename {clients/common => src/libnmc-base}/nm-vpn-helpers.c (100%) rename {clients/common => src/libnmc-base}/nm-vpn-helpers.h (100%) rename {clients/common => src/libnmc-base}/qrcodegen.c (100%) rename {clients/common => src/libnmc-base}/qrcodegen.h (100%) rename {clients/common => src/libnmc-setting}/meson.build (65%) rename {clients/common => src/libnmc-setting}/nm-meta-setting-access.c (100%) rename {clients/common => src/libnmc-setting}/nm-meta-setting-access.h (100%) rename {clients/common => src/libnmc-setting}/nm-meta-setting-base-impl.c (100%) rename {clients/common => src/libnmc-setting}/nm-meta-setting-base-impl.h (100%) rename {clients/common => src/libnmc-setting}/nm-meta-setting-base.h (100%) rename {clients/common => src/libnmc-setting}/nm-meta-setting-desc.c (99%) rename {clients/common => src/libnmc-setting}/nm-meta-setting-desc.h (100%) rename {clients/common => src/libnmc-setting}/settings-docs.h.in (100%) rename {clients/common => src/libnmc-setting}/settings-docs.xsl (100%) create mode 100644 src/libnmc-setting/tests/meson.build rename clients/common/tests/test-clients-common.c => src/libnmc-setting/tests/test-libnmc-setting.c (96%) rename {clients/common => src/libnmc-setting}/tests/wg-test0.conf (100%) rename {clients/common => src/libnmc-setting}/tests/wg-test1.conf (100%) rename {clients/common => src/libnmc-setting}/tests/wg-test2.conf (100%) rename {clients/common => src/libnmc-setting}/tests/wg-test3.conf (100%) diff --git a/.gitignore b/.gitignore index b72eabb291..1067e80e14 100644 --- a/.gitignore +++ b/.gitignore @@ -72,10 +72,6 @@ test-*.trs /clients/cloud-setup/nm-cloud-setup /clients/cloud-setup/nm-cloud-setup.service /clients/cloud-setup/tests/test-cloud-setup-general -/clients/common/settings-docs-input.xml -/clients/common/settings-docs.h -/clients/common/tests/test-clients-common -/clients/common/tests/test-libnm-core-aux /clients/nm-online /clients/tui/nmtui @@ -161,6 +157,11 @@ test-*.trs /src/libnm-client-impl/tests/test-nm-client /src/libnm-client-impl/tests/test-remote-settings-client /src/libnm-client-impl/tests/test-secret-agent +/src/libnm-client-aux-extern/tests/test-libnm-client-aux + +/src/libnmc-setting/settings-docs-input.xml +/src/libnmc-setting/settings-docs.h +/src/libnmc-setting/tests/test-libnmc-setting /clients/cli/generate-docs-nm-settings-nmcli /clients/cli/generate-docs-nm-settings-nmcli.xml @@ -284,8 +285,12 @@ test-*.trs /callouts/org.freedesktop.nm_dispatcher.service /callouts/tests/test-dispatcher-envp /clients/cli/settings-docs.c +/clients/common/settings-docs-input.xml /clients/common/settings-docs.c +/clients/common/settings-docs.h +/clients/common/tests/test-clients-common /clients/common/tests/test-general +/clients/common/tests/test-libnm-core-aux /dispatcher/nm-avahi-autoipd.action /dispatcher/nm-dispatcher /dispatcher/nmdbus-dispatcher.* diff --git a/Makefile.am b/Makefile.am index 4b2f780b53..618b769b07 100644 --- a/Makefile.am +++ b/Makefile.am @@ -741,6 +741,41 @@ EXTRA_DIST += \ ############################################################################### +check_programs += src/libnm-client-aux-extern/tests/test-libnm-client-aux + +src_libnm_client_aux_extern_tests_test_libnm_client_aux_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/src/libnm-core-public \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ + -I$(srcdir)/src \ + -I$(builddir)/src \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + $(NULL) + +src_libnm_client_aux_extern_tests_test_libnm_client_aux_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) \ + $(NULL) + +src_libnm_client_aux_extern_tests_test_libnm_client_aux_LDADD = \ + src/libnm-core-aux-extern/libnm-core-aux-extern.la \ + src/libnm-core-aux-intern/libnm-core-aux-intern.la \ + src/libnm-glib-aux/libnm-glib-aux.la \ + src/libnm-std-aux/libnm-std-aux.la \ + src/c-siphash/libc-siphash.la \ + src/libnm-client-impl/libnm.la \ + $(GLIB_LIBS) \ + $(NULL) + +$(src_libnm_client_aux_extern_tests_test_libnm_client_aux_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnm_client_aux_extern_tests_test_libnm_client_aux_OBJECTS): $(src_libnm_client_public_mkenums_h) + +############################################################################### + noinst_LTLIBRARIES += src/libnm-client-test/libnm-client-test.la src_libnm_client_test_libnm_client_test_la_CPPFLAGS = \ @@ -1789,13 +1824,14 @@ INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir libnm_noinst_data = \ clients/cli/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 \ src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml \ src/libnm-client-impl/nm-property-infos-keyfile.xml \ src/libnm-client-impl/nm-property-infos-nmcli.xml \ src/libnm-client-impl/nm-settings-docs-gir.xml \ - man/nm-settings-docs-dbus.xml \ - man/nm-settings-docs-nmcli.xml \ + src/libnmc-setting/settings-docs-input.xml \ $(NULL) noinst_DATA += $(libnm_noinst_data) @@ -1833,7 +1869,7 @@ src/libnm-client-impl/nm-settings-docs-gir.xml: tools/generate-docs-nm-settings- 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 $(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py --only-from-first $@ $(wordlist 1,3,$^) -clients/common/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 $(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py $@ $(wordlist 1,2,$^) man/nm-settings-docs-%.xml: src/libnm-client-impl/nm-property-infos-%.xml src/libnm-client-impl/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py man/common.ent @@ -4576,119 +4612,113 @@ EXTRA_DIST += \ clients/meson.build ############################################################################### -# clients/common +# src/libnmc-base ############################################################################### clients_cppflags = \ $(dflt_cppflags) \ - -I$(builddir)/clients/common \ - -I$(srcdir)/clients/common \ - -I$(builddir)/src/libnm-core-public \ - -I$(srcdir)/src/libnm-core-public \ - -I$(builddir)/src/libnm-client-public \ - -I$(srcdir)/src/libnm-client-public \ -I$(srcdir)/src \ + -I$(builddir)/src \ + -I$(srcdir)/src/libnm-core-public \ + -I$(builddir)/src/libnm-core-public \ + -I$(srcdir)/src/libnm-client-public \ + -I$(builddir)/src/libnm-client-public \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ $(NULL) -check_ltlibraries += clients/common/libnmc-base.la +check_ltlibraries += src/libnmc-base/libnmc-base.la -clients_common_libnmc_base_la_SOURCES = \ - clients/common/nm-secret-agent-simple.c \ - clients/common/nm-secret-agent-simple.h \ - clients/common/nm-vpn-helpers.c \ - clients/common/nm-vpn-helpers.h \ - clients/common/nm-client-utils.c \ - clients/common/nm-client-utils.h \ - clients/common/nm-polkit-listener.c \ - clients/common/nm-polkit-listener.h \ +src_libnmc_base_libnmc_base_la_SOURCES = \ + src/libnmc-base/nm-client-utils.c \ + src/libnmc-base/nm-client-utils.h \ + src/libnmc-base/nm-polkit-listener.c \ + src/libnmc-base/nm-polkit-listener.h \ + src/libnmc-base/nm-secret-agent-simple.c \ + src/libnmc-base/nm-secret-agent-simple.h \ + src/libnmc-base/nm-vpn-helpers.c \ + src/libnmc-base/nm-vpn-helpers.h \ $(NULL) EXTRA_DIST += \ - clients/common/qrcodegen.c \ - clients/common/qrcodegen.h + src/libnmc-base/qrcodegen.c \ + src/libnmc-base/qrcodegen.h \ + $(NULL) -clients_common_libnmc_base_la_CPPFLAGS = \ +src_libnmc_base_libnmc_base_la_CPPFLAGS = \ $(clients_cppflags) \ $(NULL) -clients_common_libnmc_base_la_LIBADD = \ +src_libnmc_base_libnmc_base_la_LIBADD = \ src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NULL) -$(clients_common_libnmc_base_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_common_libnmc_base_la_OBJECTS): $(src_libnm_client_public_mkenums_h) -$(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp +$(src_libnmc_base_libnmc_base_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnmc_base_libnmc_base_la_OBJECTS): $(src_libnm_client_public_mkenums_h) -clients_common_settings_doc_h = clients/common/settings-docs.h +############################################################################### +# src/libnmc-setting +############################################################################### + +libnmc_setting_settings_doc_h = src/libnmc-setting/settings-docs.h if BUILD_DOCS -$(clients_common_settings_doc_h): clients/common/settings-docs.xsl clients/common/settings-docs-input.xml clients/common/.dirstamp +$(libnmc_setting_settings_doc_h): src/libnmc-setting/settings-docs.xsl src/libnmc-setting/settings-docs-input.xml src/libnmc-setting/.dirstamp $(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-compare-generated.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)" +DISTCLEANFILES += $(libnmc_setting_settings_doc_h) +check-local-settings-docs: $(libnmc_setting_settings_doc_h) + $(srcdir)/tools/check-compare-generated.sh "$(srcdir)" "$(builddir)" "$(libnmc_setting_settings_doc_h)" check_local += check-local-settings-docs else -$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp - $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" +$(libnmc_setting_settings_doc_h): $(libnmc_setting_settings_doc_h).in src/libnmc-setting/.dirstamp + $(AM_V_GEN) cp "$(srcdir)/$(libnmc_setting_settings_doc_h).in" "$(builddir)/$(libnmc_setting_settings_doc_h)" check-local-settings-docs: endif EXTRA_DIST += \ - $(clients_common_settings_doc_h) \ - $(clients_common_settings_doc_h).in + $(libnmc_setting_settings_doc_h) \ + $(libnmc_setting_settings_doc_h).in -if HAVE_INTROSPECTION -check_ltlibraries += clients/common/libnmc.la -else -EXTRA_LTLIBRARIES += clients/common/libnmc.la -endif +check_ltlibraries += src/libnmc-setting/libnmc-setting.la -clients_common_libnmc_la_SOURCES = \ - clients/common/nm-meta-setting-base-impl.c \ - clients/common/nm-meta-setting-base-impl.h \ - clients/common/nm-meta-setting-base.h \ - \ - clients/common/nm-meta-setting-desc.c \ - clients/common/nm-meta-setting-desc.h \ - clients/common/nm-meta-setting-access.c \ - clients/common/nm-meta-setting-access.h \ +src_libnmc_setting_libnmc_setting_la_SOURCES = \ + src/libnmc-setting/nm-meta-setting-access.c \ + src/libnmc-setting/nm-meta-setting-access.h \ + src/libnmc-setting/nm-meta-setting-base-impl.c \ + src/libnmc-setting/nm-meta-setting-base-impl.h \ + src/libnmc-setting/nm-meta-setting-base.h \ + src/libnmc-setting/nm-meta-setting-desc.c \ + src/libnmc-setting/nm-meta-setting-desc.h \ $(NULL) -clients_common_libnmc_la_CPPFLAGS = \ +src_libnmc_setting_libnmc_setting_la_CPPFLAGS = \ $(clients_cppflags) \ $(NULL) -clients_common_libnmc_la_LIBADD = \ +src_libnmc_setting_libnmc_setting_la_LIBADD = \ src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(NULL) -$(clients_common_libnmc_la_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_common_libnmc_la_OBJECTS): $(src_libnm_client_public_mkenums_h) -$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h) -$(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp +$(src_libnmc_setting_libnmc_setting_la_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnmc_setting_libnmc_setting_la_OBJECTS): $(src_libnm_client_public_mkenums_h) +$(src_libnmc_setting_libnmc_setting_la_OBJECTS): $(libnmc_setting_settings_doc_h) +$(src_libnmc_setting_libnmc_setting_la_OBJECTS): src/libnmc-setting/.dirstamp -if HAVE_INTROSPECTION -check_programs += clients/common/tests/test-clients-common -else -if BUILD_NMCLI -check_programs += clients/common/tests/test-clients-common -endif -endif +############################################################################### -clients_common_tests_test_clients_common_CPPFLAGS = \ - -I$(srcdir)/clients/common/tests \ +check_programs += src/libnmc-setting/tests/test-libnmc-setting + +src_libnmc_setting_tests_test_libnmc_setting_CPPFLAGS = \ $(clients_cppflags) \ $(NULL) -clients_common_tests_test_clients_common_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) +src_libnmc_setting_tests_test_libnmc_setting_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) \ + $(NULL) -clients_common_tests_test_clients_common_LDADD = \ - clients/common/libnmc.la \ - clients/common/libnmc-base.la \ +src_libnmc_setting_tests_test_libnmc_setting_LDADD = \ + src/libnmc-setting/libnmc-setting.la \ + src/libnmc-base/libnmc-base.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ src/libnm-base/libnm-base.la \ @@ -4698,53 +4728,16 @@ clients_common_tests_test_clients_common_LDADD = \ src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) -$(clients_common_tests_test_clients_common_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_common_tests_test_clients_common_OBJECTS): $(src_libnm_client_public_mkenums_h) - -############################################################################### +$(src_libnmc_setting_tests_test_libnmc_setting_OBJECTS): $(src_libnm_core_public_mkenums_h) +$(src_libnmc_setting_tests_test_libnmc_setting_OBJECTS): $(src_libnm_client_public_mkenums_h) EXTRA_DIST += \ - clients/common/tests/wg-test0.conf \ - clients/common/tests/wg-test1.conf \ - clients/common/tests/wg-test2.conf \ - clients/common/tests/wg-test3.conf \ + src/libnmc-setting/tests/wg-test0.conf \ + src/libnmc-setting/tests/wg-test1.conf \ + src/libnmc-setting/tests/wg-test2.conf \ + src/libnmc-setting/tests/wg-test3.conf \ $(NULL) -############################################################################### - -check_programs += clients/common/tests/test-libnm-core-aux - -clients_common_tests_test_libnm_core_aux_CPPFLAGS = \ - $(dflt_cppflags) \ - -I$(srcdir)/src/libnm-core-public \ - -I$(builddir)/src/libnm-core-public \ - -I$(srcdir)/src/libnm-client-public \ - -I$(builddir)/src/libnm-client-public \ - -I$(srcdir)/src \ - -I$(builddir)/src \ - $(CODE_COVERAGE_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(SANITIZER_LIB_CFLAGS) \ - $(NULL) - -clients_common_tests_test_libnm_core_aux_LDFLAGS = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) \ - $(NULL) - -clients_common_tests_test_libnm_core_aux_LDADD = \ - src/libnm-core-aux-extern/libnm-core-aux-extern.la \ - src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - src/libnm-glib-aux/libnm-glib-aux.la \ - src/libnm-std-aux/libnm-std-aux.la \ - src/c-siphash/libc-siphash.la \ - src/libnm-client-impl/libnm.la \ - $(GLIB_LIBS) \ - $(NULL) - -$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(src_libnm_client_public_mkenums_h) - ############################################################################### # clients/cli ############################################################################### @@ -4778,8 +4771,8 @@ clients_cli_nmcli_CPPFLAGS = \ $(NULL) clients_cli_nmcli_LDADD = \ - clients/common/libnmc.la \ - clients/common/libnmc-base.la \ + src/libnmc-setting/libnmc-setting.la \ + src/libnmc-base/libnmc-base.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ src/libnm-base/libnm-base.la \ @@ -4820,13 +4813,12 @@ clients_cli_generate_docs_nm_settings_nmcli_SOURCES = \ $(NULL) clients_cli_generate_docs_nm_settings_nmcli_CPPFLAGS = \ - -I$(srcdir)/clients/common \ $(clients_cppflags) \ $(NULL) clients_cli_generate_docs_nm_settings_nmcli_LDADD = \ - clients/common/libnmc.la \ - clients/common/libnmc-base.la \ + src/libnmc-setting/libnmc-setting.la \ + src/libnmc-base/libnmc-base.la \ src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ @@ -4851,9 +4843,9 @@ $(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(src_libnm_client_publi EXTRA_DIST += \ clients/cli/nmcli-completion \ clients/cli/meson.build \ - clients/common/settings-docs.xsl \ - clients/common/meson.build \ - clients/common/tests/meson.build + src/libnmc-setting/settings-docs.xsl \ + src/libnmc-setting/meson.build \ + src/libnmc-setting/tests/meson.build ############################################################################### # clients/tui @@ -5015,8 +5007,8 @@ clients_tui_nmtui_LDFLAGS = \ clients_tui_nmtui_LDADD = \ clients/tui/newt/libnmt-newt.a \ - clients/common/libnmc.la \ - clients/common/libnmc-base.la \ + src/libnmc-setting/libnmc-setting.la \ + src/libnmc-base/libnmc-base.la \ src/libnm-client-aux-extern/libnm-client-aux-extern.la \ src/libnm-core-aux-extern/libnm-core-aux-extern.la \ src/libnm-core-aux-intern/libnm-core-aux-intern.la \ @@ -5532,8 +5524,6 @@ CLEANFILES += \ \ $(NULL) -CLEANFILES += clients/common/settings-docs-input.xml - ############################################################################### include Makefile.examples diff --git a/clients/cli/agent.c b/clients/cli/agent.c index fbbf9790cf..a0b23dd19b 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -12,9 +12,9 @@ #include "common.h" #include "utils.h" -#include "nm-secret-agent-simple.h" +#include "libnmc-base/nm-secret-agent-simple.h" #include "polkit-agent.h" -#include "nm-polkit-listener.h" +#include "libnmc-base/nm-polkit-listener.h" static void usage(void) diff --git a/clients/cli/common.c b/clients/cli/common.c index 6e21559f99..9309e36738 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -15,8 +15,8 @@ #include "libnm-client-aux-extern/nm-libnm-aux.h" -#include "nm-vpn-helpers.h" -#include "nm-client-utils.h" +#include "libnmc-base/nm-vpn-helpers.h" +#include "libnmc-base/nm-client-utils.h" #include "libnm-glib-aux/nm-secret-utils.h" #include "utils.h" diff --git a/clients/cli/common.h b/clients/cli/common.h index 70773ed318..f7e7181cc7 100644 --- a/clients/cli/common.h +++ b/clients/cli/common.h @@ -7,7 +7,7 @@ #define NMC_COMMON_H #include "nmcli.h" -#include "nm-secret-agent-simple.h" +#include "libnmc-base/nm-secret-agent-simple.h" gboolean print_ip_config(NMIPConfig * cfg, int addr_family, diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 97c50f5ba7..74a5b6e260 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -15,10 +15,10 @@ #include #include -#include "nm-client-utils.h" -#include "nm-vpn-helpers.h" -#include "nm-meta-setting-access.h" -#include "nm-secret-agent-simple.h" +#include "libnmc-base/nm-client-utils.h" +#include "libnmc-base/nm-vpn-helpers.h" +#include "libnmc-setting/nm-meta-setting-access.h" +#include "libnmc-base/nm-secret-agent-simple.h" #include "utils.h" #include "common.h" diff --git a/clients/cli/devices.c b/clients/cli/devices.c index dd231448b7..6cd8d0d196 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -15,8 +15,8 @@ #include "libnm-glib-aux/nm-secret-utils.h" #include "common.h" #include "connections.h" -#include "nm-client-utils.h" -#include "nm-secret-agent-simple.h" +#include "libnmc-base/nm-client-utils.h" +#include "libnmc-base/nm-secret-agent-simple.h" #include "polkit-agent.h" #include "utils.h" diff --git a/clients/cli/general.c b/clients/cli/general.c index 960d635874..f0b4309e59 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -9,7 +9,7 @@ #include "libnm-core-aux-intern/nm-common-macros.h" -#include "nm-client-utils.h" +#include "libnmc-base/nm-client-utils.h" #include "polkit-agent.h" #include "utils.h" diff --git a/clients/cli/generate-docs-nm-settings-nmcli.c b/clients/cli/generate-docs-nm-settings-nmcli.c index da2eed6d79..cd1bb67099 100644 --- a/clients/cli/generate-docs-nm-settings-nmcli.c +++ b/clients/cli/generate-docs-nm-settings-nmcli.c @@ -2,7 +2,7 @@ #include "libnm-client-aux-extern/nm-default-client.h" -#include "nm-meta-setting-desc.h" +#include "libnmc-setting/nm-meta-setting-desc.h" #define INDENT 4 diff --git a/clients/cli/meson.build b/clients/cli/meson.build index 59ef4e14a4..708b8aad9b 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -22,13 +22,13 @@ executable( 'utils.c', ), dependencies: [ - libnmc_base_dep, - libnmc_dep, libnm_dep, glib_dep, readline_dep, ], link_with: [ + libnmc_setting, + libnmc_base, libnm_client_aux_extern, libnm_core_aux_extern, libnm_core_aux_intern, @@ -50,12 +50,12 @@ generate_docs_nm_settings_nmcli = executable( 'generate-docs-nm-settings-nmcli.c', ), dependencies: [ - libnmc_base_dep, - libnmc_dep, libnm_dep, glib_dep, ], link_with: [ + libnmc_setting, + libnmc_base, libnm_core_aux_extern, libnm_core_aux_intern, libnm_base, diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 49ade6827b..e592e05482 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -18,7 +18,7 @@ #include #include -#include "nm-client-utils.h" +#include "libnmc-base/nm-client-utils.h" #include "polkit-agent.h" #include "utils.h" diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 718d777ff8..f130337879 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -6,8 +6,8 @@ #ifndef NMC_NMCLI_H #define NMC_NMCLI_H -#include "nm-secret-agent-simple.h" -#include "nm-meta-setting-desc.h" +#include "libnmc-base/nm-secret-agent-simple.h" +#include "libnmc-setting/nm-meta-setting-desc.h" struct _NMPolkitListener; diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index 9f5de2077f..7776d7e7b2 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -11,7 +11,7 @@ #include #include -#include "nm-polkit-listener.h" +#include "libnmc-base/nm-polkit-listener.h" #include "common.h" static char * diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 5258c03f3a..6c93c021f1 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -12,9 +12,9 @@ #include "libnm-core-aux-intern/nm-common-macros.h" -#include "nm-client-utils.h" -#include "nm-vpn-helpers.h" -#include "nm-meta-setting-access.h" +#include "libnmc-base/nm-client-utils.h" +#include "libnmc-base/nm-vpn-helpers.h" +#include "libnmc-setting/nm-meta-setting-access.h" #include "utils.h" #include "common.h" diff --git a/clients/cli/settings.h b/clients/cli/settings.h index f103b8fd06..2dbe76074f 100644 --- a/clients/cli/settings.h +++ b/clients/cli/settings.h @@ -6,7 +6,7 @@ #ifndef NMC_SETTINGS_H #define NMC_SETTINGS_H -#include "nm-meta-setting-desc.h" +#include "libnmc-setting/nm-meta-setting-desc.h" #include "nmcli.h" diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 537cf1f35a..6dd93f7b22 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -16,8 +16,8 @@ #include #include -#include "nm-client-utils.h" -#include "nm-meta-setting-access.h" +#include "libnmc-base/nm-client-utils.h" +#include "libnmc-setting/nm-meta-setting-access.h" #include "common.h" #include "nmcli.h" diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index 894c43daf0..f08aac094a 100644 --- a/clients/cloud-setup/meson.build +++ b/clients/cloud-setup/meson.build @@ -32,8 +32,6 @@ libnm_cloud_setup_core = static_library( 'nmcs-provider.c', ), dependencies: [ - libnmc_base_dep, - libnmc_dep, libnm_dep, libcurl_dep, ], @@ -51,12 +49,12 @@ executable( ), dependencies: [ libnm_cloud_setup_core_dep, - libnmc_base_dep, - libnmc_dep, + libnm_dep, libcurl_dep, glib_dep, ], link_with: [ + libnmc_base, libnm_client_aux_extern, libnm_core_aux_extern, libnm_core_aux_intern, diff --git a/clients/cloud-setup/tests/meson.build b/clients/cloud-setup/tests/meson.build index 65d8d48f9a..0d8e5db141 100644 --- a/clients/cloud-setup/tests/meson.build +++ b/clients/cloud-setup/tests/meson.build @@ -5,11 +5,11 @@ exe = executable( 'test-cloud-setup-general.c', dependencies: [ libnm_cloud_setup_core_dep, - libnmc_base_dep, - libnmc_dep, + libnm_dep, glib_dep, ], link_with: [ + libnmc_base, libnm_glib_aux, libnm_std_aux, libc_siphash, diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build deleted file mode 100644 index 4a7a2ffb3d..0000000000 --- a/clients/common/tests/meson.build +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -exe = executable( - 'test-clients-common', - 'test-clients-common.c', - dependencies: [ - libnmc_base_dep, - libnmc_dep, - glib_dep, - ], - link_with: [ - libnm_core_aux_extern, - libnm_core_aux_intern, - libnm_base, - libnm_glib_aux, - libnm_std_aux, - libc_siphash, - ], -) - -test( - 'clients/common/tests/test-clients-common', - test_script, - args: test_args + [exe.full_path()], -) - -exe = executable( - 'test-libnm-core-aux', - 'test-libnm-core-aux.c', - dependencies: [ - libnm_dep, - glib_dep, - ], - link_with: [ - libnm_core_aux_extern, - libnm_log_null, - libnm_glib_aux, - libnm_std_aux, - libc_siphash, - ], -) - -test( - 'clients/common/tests/test-libnm-core-aux', - test_script, - args: test_args + [exe.full_path()] -) diff --git a/clients/meson.build b/clients/meson.build index 60c5668e8d..3a401c31d4 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -18,7 +18,6 @@ executable( install: true, ) -subdir('common') subdir('cli') if enable_nmtui diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 04eeba5950..29c608b7fa 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -47,13 +47,13 @@ executable( 'nmt-widget-list.c', ), dependencies: [ - libnmc_base_dep, - libnmc_dep, libnmt_newt_dep, libnm_dep, glib_dep, ], link_with: [ + libnmc_setting, + libnmc_base, libnm_client_aux_extern, libnm_core_aux_extern, libnm_core_aux_intern, diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index fd73cd8312..c6b03bd880 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -16,7 +16,7 @@ #include "nm-editor-utils.h" #if 0 - #include "nm-vpn-helpers.h" + #include "libnmc-base/nm-vpn-helpers.h" static GSList *vpn_plugins; diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c index 5d0596728a..4503dc924b 100644 --- a/clients/tui/nmt-connect-connection-list.c +++ b/clients/tui/nmt-connect-connection-list.c @@ -17,7 +17,7 @@ #include "nmtui.h" #include "nmt-connect-connection-list.h" -#include "nm-client-utils.h" +#include "libnmc-base/nm-client-utils.h" G_DEFINE_TYPE(NmtConnectConnectionList, nmt_connect_connection_list, NMT_TYPE_NEWT_LISTBOX) diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c index 69b5e3398a..40cee1b0f8 100644 --- a/clients/tui/nmt-editor.c +++ b/clients/tui/nmt-editor.c @@ -40,7 +40,7 @@ #include "nmt-page-vlan.h" #include "nmt-page-wifi.h" -#include "nm-meta-setting-access.h" +#include "libnmc-setting/nm-meta-setting-access.h" G_DEFINE_TYPE(NmtEditor, nmt_editor, NMT_TYPE_NEWT_FORM) diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c index 5f68946b33..99b9b3f785 100644 --- a/clients/tui/nmt-password-dialog.c +++ b/clients/tui/nmt-password-dialog.c @@ -14,7 +14,7 @@ #include "libnm-client-aux-extern/nm-default-client.h" #include "nmt-password-dialog.h" -#include "nm-secret-agent-simple.h" +#include "libnmc-base/nm-secret-agent-simple.h" #include "nmtui.h" G_DEFINE_TYPE(NmtPasswordDialog, nmt_password_dialog, NMT_TYPE_NEWT_FORM) diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 23439ced73..fc942419f2 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -21,9 +21,9 @@ #include "nmtui-connect.h" #include "nmt-connect-connection-list.h" #include "nmt-password-dialog.h" -#include "nm-secret-agent-simple.h" -#include "nm-vpn-helpers.h" -#include "nm-client-utils.h" +#include "libnmc-base/nm-secret-agent-simple.h" +#include "libnmc-base/nm-vpn-helpers.h" +#include "libnmc-base/nm-client-utils.h" #include "nmt-utils.h" /** diff --git a/po/POTFILES.in b/po/POTFILES.in index 2314ab721b..cd3efbdb6b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -11,13 +11,6 @@ clients/cli/polkit-agent.c clients/cli/settings.c clients/cli/utils.c clients/cli/utils.h -clients/common/nm-client-utils.c -clients/common/nm-meta-setting-access.c -clients/common/nm-meta-setting-desc.c -clients/common/nm-polkit-listener.c -clients/common/nm-secret-agent-simple.c -clients/common/nm-vpn-helpers.c -clients/common/settings-docs.h.in clients/nm-online.c clients/tui/newt/nmt-newt-utils.c clients/tui/nm-editor-utils.c @@ -183,3 +176,10 @@ src/libnm-core-impl/nm-vpn-editor-plugin.c src/libnm-core-impl/nm-vpn-plugin-info.c src/libnm-glib-aux/nm-shared-utils.c src/libnm-log-core/nm-logging.c +src/libnmc-base/nm-client-utils.c +src/libnmc-base/nm-polkit-listener.c +src/libnmc-base/nm-secret-agent-simple.c +src/libnmc-base/nm-vpn-helpers.c +src/libnmc-setting/nm-meta-setting-access.c +src/libnmc-setting/nm-meta-setting-desc.c +src/libnmc-setting/settings-docs.h.in diff --git a/src/libnm-client-aux-extern/tests/meson.build b/src/libnm-client-aux-extern/tests/meson.build new file mode 100644 index 0000000000..341ead0f7b --- /dev/null +++ b/src/libnm-client-aux-extern/tests/meson.build @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +exe = executable( + 'test-libnm-client-aux', + 'test-libnm-client-aux.c', + dependencies: [ + libnm_dep, + glib_dep, + ], + link_with: [ + libnm_core_aux_extern, + libnm_log_null, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, + ], +) + +test( + 'src/libnm-client-aux-extern/tests/test-libnm-client-aux', + test_script, + args: test_args + [exe.full_path()] +) diff --git a/clients/common/tests/test-libnm-core-aux.c b/src/libnm-client-aux-extern/tests/test-libnm-client-aux.c similarity index 100% rename from clients/common/tests/test-libnm-core-aux.c rename to src/libnm-client-aux-extern/tests/test-libnm-client-aux.c diff --git a/src/libnmc-base/meson.build b/src/libnmc-base/meson.build new file mode 100644 index 0000000000..adb71531df --- /dev/null +++ b/src/libnmc-base/meson.build @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +libnmc_base = static_library( + 'nmc-base', + sources: files( + 'nm-client-utils.c', + 'nm-secret-agent-simple.c', + 'nm-vpn-helpers.c', + 'nm-polkit-listener.c', + ), + dependencies: [ + libnm_dep, + glib_dep, + ], +) diff --git a/clients/common/nm-client-utils.c b/src/libnmc-base/nm-client-utils.c similarity index 100% rename from clients/common/nm-client-utils.c rename to src/libnmc-base/nm-client-utils.c diff --git a/clients/common/nm-client-utils.h b/src/libnmc-base/nm-client-utils.h similarity index 98% rename from clients/common/nm-client-utils.h rename to src/libnmc-base/nm-client-utils.h index 0fd25c305d..7017e39a75 100644 --- a/clients/common/nm-client-utils.h +++ b/src/libnmc-base/nm-client-utils.h @@ -6,7 +6,6 @@ #ifndef __NM_CLIENT_UTILS_H__ #define __NM_CLIENT_UTILS_H__ -#include "nm-meta-setting-desc.h" #include "nm-active-connection.h" #include "nm-device.h" #include "libnm-core-aux-intern/nm-libnm-core-utils.h" diff --git a/clients/common/nm-polkit-listener.c b/src/libnmc-base/nm-polkit-listener.c similarity index 100% rename from clients/common/nm-polkit-listener.c rename to src/libnmc-base/nm-polkit-listener.c diff --git a/clients/common/nm-polkit-listener.h b/src/libnmc-base/nm-polkit-listener.h similarity index 100% rename from clients/common/nm-polkit-listener.h rename to src/libnmc-base/nm-polkit-listener.h diff --git a/clients/common/nm-secret-agent-simple.c b/src/libnmc-base/nm-secret-agent-simple.c similarity index 100% rename from clients/common/nm-secret-agent-simple.c rename to src/libnmc-base/nm-secret-agent-simple.c diff --git a/clients/common/nm-secret-agent-simple.h b/src/libnmc-base/nm-secret-agent-simple.h similarity index 100% rename from clients/common/nm-secret-agent-simple.h rename to src/libnmc-base/nm-secret-agent-simple.h diff --git a/clients/common/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c similarity index 100% rename from clients/common/nm-vpn-helpers.c rename to src/libnmc-base/nm-vpn-helpers.c diff --git a/clients/common/nm-vpn-helpers.h b/src/libnmc-base/nm-vpn-helpers.h similarity index 100% rename from clients/common/nm-vpn-helpers.h rename to src/libnmc-base/nm-vpn-helpers.h diff --git a/clients/common/qrcodegen.c b/src/libnmc-base/qrcodegen.c similarity index 100% rename from clients/common/qrcodegen.c rename to src/libnmc-base/qrcodegen.c diff --git a/clients/common/qrcodegen.h b/src/libnmc-base/qrcodegen.h similarity index 100% rename from clients/common/qrcodegen.h rename to src/libnmc-base/qrcodegen.h diff --git a/clients/common/meson.build b/src/libnmc-setting/meson.build similarity index 65% rename from clients/common/meson.build rename to src/libnmc-setting/meson.build index 6f53d877a1..8f07ae634e 100644 --- a/clients/common/meson.build +++ b/src/libnmc-setting/meson.build @@ -1,28 +1,5 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -common_inc = include_directories('.') - -libnmc_base = static_library( - 'nmc-base', - sources: files( - 'nm-client-utils.c', - 'nm-secret-agent-simple.c', - 'nm-vpn-helpers.c', - 'nm-polkit-listener.c', - ), - dependencies: [ - libnm_dep, - ], -) - -libnmc_base_dep = declare_dependency( - include_directories: common_inc, - dependencies: [ - libnm_dep, - ], - link_with: libnmc_base, -) - if enable_docs settings_docs_input_xml = custom_target( 'settings-docs-input.xml', @@ -50,7 +27,7 @@ if enable_docs args: [ source_root, build_root, - 'clients/common/settings-docs.h', + 'src/libnmc-setting/settings-docs.h', ], ) else @@ -61,8 +38,8 @@ else ) endif -libnmc = static_library( - 'nmc', +libnmc_setting = static_library( + 'nmc-setting', sources: [settings_docs_source] + files( 'nm-meta-setting-access.c', 'nm-meta-setting-base-impl.c', @@ -73,15 +50,3 @@ libnmc = static_library( ], link_depends: settings_docs_source, ) - -libnmc_dep = declare_dependency( - include_directories: common_inc, - dependencies: [ - libnm_dep, - ], - link_with: libnmc, -) - -if (enable_introspection or enable_nmtui) and enable_tests - subdir('tests') -endif diff --git a/clients/common/nm-meta-setting-access.c b/src/libnmc-setting/nm-meta-setting-access.c similarity index 100% rename from clients/common/nm-meta-setting-access.c rename to src/libnmc-setting/nm-meta-setting-access.c diff --git a/clients/common/nm-meta-setting-access.h b/src/libnmc-setting/nm-meta-setting-access.h similarity index 100% rename from clients/common/nm-meta-setting-access.h rename to src/libnmc-setting/nm-meta-setting-access.h diff --git a/clients/common/nm-meta-setting-base-impl.c b/src/libnmc-setting/nm-meta-setting-base-impl.c similarity index 100% rename from clients/common/nm-meta-setting-base-impl.c rename to src/libnmc-setting/nm-meta-setting-base-impl.c diff --git a/clients/common/nm-meta-setting-base-impl.h b/src/libnmc-setting/nm-meta-setting-base-impl.h similarity index 100% rename from clients/common/nm-meta-setting-base-impl.h rename to src/libnmc-setting/nm-meta-setting-base-impl.h diff --git a/clients/common/nm-meta-setting-base.h b/src/libnmc-setting/nm-meta-setting-base.h similarity index 100% rename from clients/common/nm-meta-setting-base.h rename to src/libnmc-setting/nm-meta-setting-base.h diff --git a/clients/common/nm-meta-setting-desc.c b/src/libnmc-setting/nm-meta-setting-desc.c similarity index 99% rename from clients/common/nm-meta-setting-desc.c rename to src/libnmc-setting/nm-meta-setting-desc.c index c814066719..3daa6ad1d8 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/src/libnmc-setting/nm-meta-setting-desc.c @@ -18,8 +18,8 @@ #include "libnm-core-aux-intern/nm-libnm-core-utils.h" #include "libnm-core-aux-extern/nm-libnm-core-aux.h" -#include "nm-vpn-helpers.h" -#include "nm-client-utils.h" +#include "libnmc-base/nm-vpn-helpers.h" +#include "libnmc-base/nm-client-utils.h" #include "nm-meta-setting-access.h" /*****************************************************************************/ @@ -4512,7 +4512,7 @@ static const NMMetaPropertyType _pt_objlist = { /*****************************************************************************/ -#include "settings-docs.h" +#include "libnmc-setting/settings-docs.h" /*****************************************************************************/ diff --git a/clients/common/nm-meta-setting-desc.h b/src/libnmc-setting/nm-meta-setting-desc.h similarity index 100% rename from clients/common/nm-meta-setting-desc.h rename to src/libnmc-setting/nm-meta-setting-desc.h diff --git a/clients/common/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in similarity index 100% rename from clients/common/settings-docs.h.in rename to src/libnmc-setting/settings-docs.h.in diff --git a/clients/common/settings-docs.xsl b/src/libnmc-setting/settings-docs.xsl similarity index 100% rename from clients/common/settings-docs.xsl rename to src/libnmc-setting/settings-docs.xsl diff --git a/src/libnmc-setting/tests/meson.build b/src/libnmc-setting/tests/meson.build new file mode 100644 index 0000000000..6c71f286b3 --- /dev/null +++ b/src/libnmc-setting/tests/meson.build @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +exe = executable( + 'test-libnmc-setting', + 'test-libnmc-setting.c', + dependencies: [ + libnm_dep, + glib_dep, + ], + link_with: [ + libnmc_setting, + libnmc_base, + libnm_core_aux_extern, + libnm_core_aux_intern, + libnm_base, + libnm_glib_aux, + libnm_std_aux, + libc_siphash, + ], +) + +test( + 'src/libnmc-setting/tests/test-libnmc-setting', + test_script, + args: test_args + [exe.full_path()], +) diff --git a/clients/common/tests/test-clients-common.c b/src/libnmc-setting/tests/test-libnmc-setting.c similarity index 96% rename from clients/common/tests/test-clients-common.c rename to src/libnmc-setting/tests/test-libnmc-setting.c index f06b01208c..fe196ad014 100644 --- a/clients/common/tests/test-clients-common.c +++ b/src/libnmc-setting/tests/test-libnmc-setting.c @@ -5,9 +5,9 @@ #include "libnm-client-aux-extern/nm-default-client.h" -#include "nm-meta-setting-access.h" -#include "nm-vpn-helpers.h" -#include "nm-client-utils.h" +#include "libnmc-setting/nm-meta-setting-access.h" +#include "libnmc-base/nm-vpn-helpers.h" +#include "libnmc-base/nm-client-utils.h" #include "libnm-glib-aux/nm-test-utils.h" @@ -169,7 +169,7 @@ test_client_import_wireguard_test0(void) gs_free_error GError *error = NULL; connection = - nm_vpn_wireguard_import(NM_BUILD_SRCDIR "/clients/common/tests/wg-test0.conf", &error); + nm_vpn_wireguard_import(NM_BUILD_SRCDIR "/src/libnmc-setting/tests/wg-test0.conf", &error); g_assert_no_error(error); @@ -231,7 +231,7 @@ test_client_import_wireguard_test1(void) { gs_free_error GError *error = NULL; - nm_vpn_wireguard_import(NM_BUILD_SRCDIR "/clients/common/tests/wg-test1.conf", &error); + nm_vpn_wireguard_import(NM_BUILD_SRCDIR "/src/libnmc-setting/tests/wg-test1.conf", &error); g_assert_error(error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT); g_assert(g_str_has_prefix(error->message, "invalid secret 'PrivateKey'")); g_assert(g_str_has_suffix(error->message, "wg-test1.conf:2")); @@ -242,7 +242,7 @@ test_client_import_wireguard_test2(void) { gs_free_error GError *error = NULL; - nm_vpn_wireguard_import(NM_BUILD_SRCDIR "/clients/common/tests/wg-test2.conf", &error); + nm_vpn_wireguard_import(NM_BUILD_SRCDIR "/src/libnmc-setting/tests/wg-test2.conf", &error); g_assert_error(error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT); g_assert(g_str_has_prefix(error->message, "unrecognized line at")); @@ -254,7 +254,7 @@ test_client_import_wireguard_test3(void) { gs_free_error GError *error = NULL; - nm_vpn_wireguard_import(NM_BUILD_SRCDIR "/clients/common/tests/wg-test3.conf", &error); + nm_vpn_wireguard_import(NM_BUILD_SRCDIR "/src/libnmc-setting/tests/wg-test3.conf", &error); g_assert_error(error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT); g_assert(g_str_has_prefix(error->message, "invalid value for 'ListenPort'")); g_assert(g_str_has_suffix(error->message, "wg-test3.conf:3")); @@ -265,7 +265,7 @@ test_client_import_wireguard_missing(void) { gs_free_error GError *error = NULL; - nm_vpn_wireguard_import(NM_BUILD_SRCDIR "/clients/common/tests/wg-missing.conf", &error); + nm_vpn_wireguard_import(NM_BUILD_SRCDIR "/src/libnmc-setting/tests/wg-missing.conf", &error); g_assert_error(error, G_FILE_ERROR, G_FILE_ERROR_NOENT); } diff --git a/clients/common/tests/wg-test0.conf b/src/libnmc-setting/tests/wg-test0.conf similarity index 100% rename from clients/common/tests/wg-test0.conf rename to src/libnmc-setting/tests/wg-test0.conf diff --git a/clients/common/tests/wg-test1.conf b/src/libnmc-setting/tests/wg-test1.conf similarity index 100% rename from clients/common/tests/wg-test1.conf rename to src/libnmc-setting/tests/wg-test1.conf diff --git a/clients/common/tests/wg-test2.conf b/src/libnmc-setting/tests/wg-test2.conf similarity index 100% rename from clients/common/tests/wg-test2.conf rename to src/libnmc-setting/tests/wg-test2.conf diff --git a/clients/common/tests/wg-test3.conf b/src/libnmc-setting/tests/wg-test3.conf similarity index 100% rename from clients/common/tests/wg-test3.conf rename to src/libnmc-setting/tests/wg-test3.conf diff --git a/src/meson.build b/src/meson.build index 8301d8c682..5a5ba82e57 100644 --- a/src/meson.build +++ b/src/meson.build @@ -85,6 +85,8 @@ subdir('libnm-core-aux-extern') subdir('libnm-client-public') subdir('libnm-client-impl') subdir('libnm-client-aux-extern') +subdir('libnmc-base') +subdir('libnmc-setting') subdir('core') subdir('nm-dispatcher') subdir('contrib') @@ -95,6 +97,8 @@ if enable_tests subdir('libnm-platform/tests') subdir('libnm-core-impl/tests') subdir('libnm-client-impl/tests') + subdir('libnm-client-aux-extern/tests') + subdir('libnmc-setting/tests') subdir('nm-dispatcher/tests') subdir('contrib/tests') endif diff --git a/tools/check-tree.sh b/tools/check-tree.sh index 1975b0931b..b950496181 100755 --- a/tools/check-tree.sh +++ b/tools/check-tree.sh @@ -20,5 +20,5 @@ check_cmp() { } check_cmp src/libnm-base/nm-ethtool-utils-base.h src/libnm-client-public/nm-ethtool-utils.h -check_cmp src/libnm-core-intern/nm-meta-setting-base-impl.h clients/common/nm-meta-setting-base-impl.h -check_cmp src/libnm-core-impl/nm-meta-setting-base-impl.c clients/common/nm-meta-setting-base-impl.c +check_cmp src/libnm-core-intern/nm-meta-setting-base-impl.h src/libnmc-setting/nm-meta-setting-base-impl.h +check_cmp src/libnm-core-impl/nm-meta-setting-base-impl.c src/libnmc-setting/nm-meta-setting-base-impl.c