cloud-setup: move from "clients/cloud-setup/" to "src/nm-cloud-setup/"

.gitignore

@@ -69,9 +69,6 @@ test-*.trs
 /src/nm-dispatcher/tests/test-dispatcher-envp
 
 /clients/cli/nmcli
-/clients/cloud-setup/nm-cloud-setup
-/clients/cloud-setup/nm-cloud-setup.service
-/clients/cloud-setup/tests/test-cloud-setup-general
 /clients/tui/nmtui
 
 /data/NetworkManager.service
@@ -167,6 +164,10 @@ test-*.trs
 /src/nm-initrd-generator/tests/test-dt-reader
 /src/nm-initrd-generator/tests/test-ibft-reader
 
+/src/nm-cloud-setup/nm-cloud-setup
+/src/nm-cloud-setup/nm-cloud-setup.service
+/src/nm-cloud-setup/tests/test-cloud-setup-general
+
 /src/nm-online/nm-online
 
 /clients/cli/generate-docs-nm-settings-nmcli
@@ -287,6 +288,9 @@ test-*.trs
 /callouts/org.freedesktop.nm_dispatcher.service
 /callouts/tests/test-dispatcher-envp
 /clients/cli/settings-docs.c
+/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.c
 /clients/common/settings-docs.h
@@ -324,7 +328,6 @@ test-*.trs
 /docs/libnm-util/tmpl/
 /docs/libnm-util/version.xml
 /docs/libnm-util/xml/
-/man/nm-settings.xml
 /include/
 /initscript/*/[Nn]etwork[Mm]anager
 /initscript/Slackware/rc.networkmanager
@@ -332,20 +335,20 @@ test-*.trs
 /introspection/nmdbus-*.h
 /introspection/nmdbus-*.xml
 /libgsystem/
-/libnm-core/tests/test-setting-8021x
-/libnm-core/tests/test-setting-bond
-/libnm-core/tests/test-setting-dcb
+/libnm-core/nm-dbus-types.xml
+/libnm-core/nm-version-macros.h
+/libnm-core/nm-vpn-dbus-types.xml
 /libnm-core/tests/test-compare
 /libnm-core/tests/test-crypto
-/libnm-core/tests/test-settings-defaults
 /libnm-core/tests/test-general
 /libnm-core/tests/test-keyfile
 /libnm-core/tests/test-need-secrets
 /libnm-core/tests/test-secrets
 /libnm-core/tests/test-setting
-/libnm-core/nm-dbus-types.xml
-/libnm-core/nm-version-macros.h
-/libnm-core/nm-vpn-dbus-types.xml
+/libnm-core/tests/test-setting-8021x
+/libnm-core/tests/test-setting-bond
+/libnm-core/tests/test-setting-dcb
+/libnm-core/tests/test-settings-defaults
 /libnm-glib/libnm-glib-test
 /libnm-glib/nm-secret-agent-glue.h
 /libnm-glib/nm-vpn-plugin-glue.h
@@ -380,6 +383,7 @@ test-*.trs
 /libnm/tests/test-nm-client
 /libnm/tests/test-remote-settings-client
 /libnm/tests/test-secret-agent
+/man/nm-settings.xml
 /policy/org.freedesktop.NetworkManager.policy
 /policy/org.freedesktop.NetworkManager.policy.in
 /shared/nm-glib-aux/tests/test-json-aux
@@ -387,26 +391,6 @@ test-*.trs
 /shared/nm-platform/tests/test-nm-platform
 /shared/nm-utils/tests/test-shared-general
 /shared/nm-version-macros.h
-/src/devices/tests/test-arping
-/src/devices/wifi/tests/test-general
-/src/devices/wifi/tests/test-wifi-ap-utils
-/src/dhcp-manager/nm-dhcp-helper
-/src/dhcp-manager/tests/test-dhcp-dhclient
-/src/dhcp-manager/tests/test-dhcp-options
-/src/dhcp-manager/tests/test-dhcp-utils
-/src/dnsmasq-manager/tests/test-dnsmasq-utils
-/src/platform/tests/dump
-/src/platform/tests/platform
-/src/platform/tests/test-general
-/src/rdisc/
-/src/settings/plugins/ibft/tests/test-ibft
-/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
-/src/settings/plugins/ifnet
-/src/settings/plugins/keyfile/tests/test-keyfile
-/src/supplicant-manager/tests/test-supplicant-config
-/src/tests/test-general
-/src/tests/test-general-with-expect
-/src/tests/test-resolvconf-capture
 /src/NetworkManager
 /src/NetworkManager-all-sym
 /src/NetworkManager.ver
@@ -416,26 +400,37 @@ test-*.trs
 /src/core/initrd/tests/test-ibft-reader
 /src/devices/bluetooth/tests/nm-bt-test
 /src/devices/tests/test-acd
+/src/devices/tests/test-arping
 /src/devices/tests/test-lldp
 /src/devices/wifi/tests/test-devices-wifi
+/src/devices/wifi/tests/test-general
+/src/devices/wifi/tests/test-wifi-ap-utils
 /src/devices/wwan/tests/test-service-providers
+/src/dhcp-manager/nm-dhcp-helper
+/src/dhcp-manager/tests/test-dhcp-dhclient
+/src/dhcp-manager/tests/test-dhcp-options
+/src/dhcp-manager/tests/test-dhcp-utils
 /src/dhcp/nm-dhcp-helper
 /src/dhcp/tests/test-dhcp-dhclient
 /src/dhcp/tests/test-dhcp-options
 /src/dhcp/tests/test-dhcp-utils
+/src/dnsmasq-manager/tests/test-dnsmasq-utils
 /src/dnsmasq/tests/test-dnsmasq-utils
 /src/initrd/nm-initrd-generator
 /src/initrd/tests/test-cmdline-reader
 /src/initrd/tests/test-dt-reader
 /src/initrd/tests/test-ibft-reader
-/src/nm-iface-helper
 /src/ndisc/tests/test-ndisc-fake
 /src/ndisc/tests/test-ndisc-linux
+/src/nm-iface-helper
+/src/platform/tests/dump
 /src/platform/tests/monitor
+/src/platform/tests/platform
 /src/platform/tests/test-address-fake
 /src/platform/tests/test-address-linux
 /src/platform/tests/test-cleanup-fake
 /src/platform/tests/test-cleanup-linux
+/src/platform/tests/test-general
 /src/platform/tests/test-link-fake
 /src/platform/tests/test-link-linux
 /src/platform/tests/test-nmp-object
@@ -444,19 +439,28 @@ test-*.trs
 /src/platform/tests/test-route-linux
 /src/platform/tests/test-tc-fake
 /src/platform/tests/test-tc-linux
+/src/rdisc/
+/src/settings/plugins/ibft/tests/test-ibft
 /src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch]
-/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
-/src/settings/plugins/ifupdown/tests/test-ifupdown
-/src/settings/plugins/keyfile/tests/test-keyfile-settings
 /src/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/
+/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
+/src/settings/plugins/ifnet
+/src/settings/plugins/ifupdown/tests/test-ifupdown
+/src/settings/plugins/keyfile/tests/test-keyfile
+/src/settings/plugins/keyfile/tests/test-keyfile-settings
+/src/supplicant-manager/tests/test-supplicant-config
 /src/supplicant/tests/test-supplicant-config
 /src/tests/config/test-config
 /src/tests/test-core
 /src/tests/test-core-with-expect
 /src/tests/test-dcb
+/src/tests/test-general
+/src/tests/test-general-with-expect
 /src/tests/test-ip4-config
 /src/tests/test-ip6-config
 /src/tests/test-l3cfg
+/src/tests/test-resolvconf-capture
 /src/tests/test-route-manager-fake
 /src/tests/test-route-manager-linux
 /src/tests/test-systemd

Makefile.am

@@ -5052,54 +5052,54 @@ endif
 EXTRA_DIST += clients/tui/meson.build
 
 ###############################################################################
-# clients/nm-cloud-setup
+# src/nm-cloud-setup
 ###############################################################################
 
 if BUILD_NM_CLOUD_SETUP
 
-noinst_LIBRARIES += clients/cloud-setup/libnm-cloud-setup-core.a
+noinst_LIBRARIES += src/nm-cloud-setup/libnm-cloud-setup-core.a
 
-clients_cloud_setup_libnm_cloud_setup_core_a_SOURCES = \
-	clients/cloud-setup/nm-cloud-setup-utils.c \
-	clients/cloud-setup/nm-cloud-setup-utils.h \
-	clients/cloud-setup/nm-http-client.c \
-	clients/cloud-setup/nm-http-client.h \
-	clients/cloud-setup/nmcs-provider.c \
-	clients/cloud-setup/nmcs-provider.h \
-	clients/cloud-setup/nmcs-provider-ec2.c \
-	clients/cloud-setup/nmcs-provider-ec2.h \
-	clients/cloud-setup/nmcs-provider-gcp.c \
-	clients/cloud-setup/nmcs-provider-gcp.h \
-	clients/cloud-setup/nmcs-provider-azure.c \
-	clients/cloud-setup/nmcs-provider-azure.h \
+src_nm_cloud_setup_libnm_cloud_setup_core_a_SOURCES = \
+	src/nm-cloud-setup/nm-cloud-setup-utils.c \
+	src/nm-cloud-setup/nm-cloud-setup-utils.h \
+	src/nm-cloud-setup/nm-http-client.c \
+	src/nm-cloud-setup/nm-http-client.h \
+	src/nm-cloud-setup/nmcs-provider.c \
+	src/nm-cloud-setup/nmcs-provider.h \
+	src/nm-cloud-setup/nmcs-provider-ec2.c \
+	src/nm-cloud-setup/nmcs-provider-ec2.h \
+	src/nm-cloud-setup/nmcs-provider-gcp.c \
+	src/nm-cloud-setup/nmcs-provider-gcp.h \
+	src/nm-cloud-setup/nmcs-provider-azure.c \
+	src/nm-cloud-setup/nmcs-provider-azure.h \
 	$(NULL)
 
-clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS = \
+src_nm_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS = \
 	$(clients_cppflags) \
 	$(LIBCURL_CFLAGS) \
 	$(NULL)
 
-$(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(src_libnm_client_public_mkenums_h)
+$(src_nm_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(src_libnm_core_public_mkenums_h)
+$(src_nm_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(src_libnm_client_public_mkenums_h)
 
-libexec_PROGRAMS += clients/cloud-setup/nm-cloud-setup
+libexec_PROGRAMS += src/nm-cloud-setup/nm-cloud-setup
 
-clients_cloud_setup_nm_cloud_setup_SOURCES = \
-	clients/cloud-setup/main.c \
+src_nm_cloud_setup_nm_cloud_setup_SOURCES = \
+	src/nm-cloud-setup/main.c \
 	$(NULL)
 
-clients_cloud_setup_nm_cloud_setup_CPPFLAGS = \
+src_nm_cloud_setup_nm_cloud_setup_CPPFLAGS = \
 	$(clients_cppflags) \
 	$(LIBCURL_CFLAGS) \
 	$(NULL)
 
-clients_cloud_setup_nm_cloud_setup_LDFLAGS = \
+src_nm_cloud_setup_nm_cloud_setup_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-clients_cloud_setup_nm_cloud_setup_LDADD = \
-	clients/cloud-setup/libnm-cloud-setup-core.a \
+src_nm_cloud_setup_nm_cloud_setup_LDADD = \
+	src/nm-cloud-setup/libnm-cloud-setup-core.a \
 	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 \
@@ -5112,21 +5112,21 @@ clients_cloud_setup_nm_cloud_setup_LDADD = \
 	$(LIBCURL_LIBS) \
 	$(NULL)
 
-$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(src_libnm_client_public_mkenums_h)
+$(src_nm_cloud_setup_nm_cloud_setup_OBJECTS): $(src_libnm_core_public_mkenums_h)
+$(src_nm_cloud_setup_nm_cloud_setup_OBJECTS): $(src_libnm_client_public_mkenums_h)
 
 if HAVE_SYSTEMD
 
 systemdsystemunit_DATA += \
-	clients/cloud-setup/nm-cloud-setup.service \
-	clients/cloud-setup/nm-cloud-setup.timer \
+	src/nm-cloud-setup/nm-cloud-setup.service \
+	src/nm-cloud-setup/nm-cloud-setup.timer \
 	$(NULL)
 
-clients/cloud-setup/nm-cloud-setup.service: $(srcdir)/clients/cloud-setup/nm-cloud-setup.service.in
+src/nm-cloud-setup/nm-cloud-setup.service: $(srcdir)/src/nm-cloud-setup/nm-cloud-setup.service.in
 	$(AM_V_GEN) $(data_edit) $< >$@
 
 install-data-hook-cloud-setup: install-data-hook-dispatcher
-	$(INSTALL_SCRIPT) "$(srcdir)/clients/cloud-setup/90-nm-cloud-setup.sh" "$(DESTDIR)$(nmlibdir)/dispatcher.d/no-wait.d/"
+	$(INSTALL_SCRIPT) "$(srcdir)/src/nm-cloud-setup/90-nm-cloud-setup.sh" "$(DESTDIR)$(nmlibdir)/dispatcher.d/no-wait.d/"
 	ln -fs no-wait.d/90-nm-cloud-setup.sh "$(DESTDIR)$(nmlibdir)/dispatcher.d/90-nm-cloud-setup.sh"
 
 install_data_hook += install-data-hook-cloud-setup
@@ -5140,31 +5140,30 @@ uninstall_hook += uninstall-hook-cloud-setup
 endif
 
 EXTRA_DIST += \
-	clients/cloud-setup/90-nm-cloud-setup.sh \
-	clients/cloud-setup/meson.build \
-	clients/cloud-setup/nm-cloud-setup.service.in \
-	clients/cloud-setup/nm-cloud-setup.timer \
-	clients/cloud-setup/tests/meson.build \
+	src/nm-cloud-setup/90-nm-cloud-setup.sh \
+	src/nm-cloud-setup/meson.build \
+	src/nm-cloud-setup/nm-cloud-setup.service.in \
+	src/nm-cloud-setup/nm-cloud-setup.timer \
+	src/nm-cloud-setup/tests/meson.build \
 	$(NULL)
 
 CLEANFILES += \
-	clients/cloud-setup/nm-cloud-setup.service
+	src/nm-cloud-setup/nm-cloud-setup.service
 
-check_programs += clients/cloud-setup/tests/test-cloud-setup-general
+check_programs += src/nm-cloud-setup/tests/test-cloud-setup-general
 
-clients_cloud_setup_tests_test_cloud_setup_general_CPPFLAGS = \
+src_nm_cloud_setup_tests_test_cloud_setup_general_CPPFLAGS = \
 	$(clients_cppflags) \
-	-I$(srcdir)/clients/cloud-setup \
 	$(LIBCURL_CFLAGS) \
 	$(NULL)
 
-clients_cloud_setup_tests_test_cloud_setup_general_LDFLAGS = \
+src_nm_cloud_setup_tests_test_cloud_setup_general_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \
-	clients/cloud-setup/libnm-cloud-setup-core.a \
+src_nm_cloud_setup_tests_test_cloud_setup_general_LDADD = \
+	src/nm-cloud-setup/libnm-cloud-setup-core.a \
 	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 \
@@ -5177,8 +5176,8 @@ clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \
 	$(LIBCURL_LIBS) \
 	$(NULL)
 
-$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(src_libnm_client_public_mkenums_h)
+$(src_nm_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(src_libnm_core_public_mkenums_h)
+$(src_nm_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(src_libnm_client_public_mkenums_h)
 
 endif
 

clients/meson.build

@@ -5,7 +5,3 @@ subdir('cli')
 if enable_nmtui
   subdir('tui')
 endif
-
-if enable_nm_cloud_setup
-  subdir('cloud-setup')
-endif

po/POTFILES.skip

@@ -1,4 +1,3 @@
-clients/cloud-setup/nm-cloud-setup.service.in
 contrib/fedora/rpm/
 data/NetworkManager-wait-online.service.in
 data/NetworkManager.service.in
@@ -7,6 +6,7 @@ examples/python/NetworkManager.py
 examples/python/systray/eggtrayicon.c
 src/contrib/nm-vpn-editor-plugin-call.h
 src/contrib/nm-vpn-plugin-utils.c
+src/nm-cloud-setup/nm-cloud-setup.service.in
 vpn-daemons/openvpn
 vpn-daemons/pptp
 vpn-daemons/vpnc

src/meson.build

@@ -93,6 +93,9 @@ endif
 subdir('nm-dispatcher')
 subdir('nm-online')
 subdir('nm-initrd-generator')
+if enable_nm_cloud_setup
+  subdir('nm-cloud-setup')
+endif
 subdir('core')
 subdir('contrib')
 
@@ -106,5 +109,8 @@ if enable_tests
   subdir('libnmc-setting/tests')
   subdir('nm-dispatcher/tests')
   subdir('nm-initrd-generator/tests')
+  if enable_nm_cloud_setup
+    subdir('nm-cloud-setup/tests')
+  endif
   subdir('contrib/tests')
 endif

src/nm-cloud-setup/meson.build

@@ -33,27 +33,23 @@ libnm_cloud_setup_core = static_library(
   ),
   dependencies: [
     libnm_dep,
+    glib_dep,
     libcurl_dep,
   ],
 )
 
-libnm_cloud_setup_core_dep = declare_dependency(
-  include_directories: include_directories('.'),
-  link_with: libnm_cloud_setup_core,
-)
-
 executable(
   'nm-cloud-setup',
   files(
     'main.c',
   ),
   dependencies: [
-    libnm_cloud_setup_core_dep,
     libnm_dep,
-    libcurl_dep,
     glib_dep,
+    libcurl_dep,
   ],
   link_with: [
+    libnm_cloud_setup_core,
     libnmc_base,
     libnm_client_aux_extern,
     libnm_core_aux_extern,
@@ -68,7 +64,3 @@ executable(
   install: true,
   install_dir: nm_libexecdir,
 )
-
-if enable_tests
-  subdir('tests')
-endif

src/nm-cloud-setup/tests/meson.build

@@ -4,11 +4,12 @@ exe = executable(
   'test-cloud-setup-general',
   'test-cloud-setup-general.c',
   dependencies: [
-    libnm_cloud_setup_core_dep,
     libnm_dep,
     glib_dep,
+    libcurl_dep,
   ],
   link_with: [
+    libnm_cloud_setup_core,
     libnmc_base,
     libnm_glib_aux,
     libnm_std_aux,
@@ -17,7 +18,7 @@ exe = executable(
 )
 
 test(
-  'clients/cloud-setup/tests/test-cloud-setup-general',
+  'src/nm-cloud-setup/tests/test-cloud-setup-general',
   test_script,
   args: test_args + [exe.full_path()],
 )

src/nm-cloud-setup/tests/test-cloud-setup-general.c

@@ -2,7 +2,7 @@
 
 #include "libnm-client-aux-extern/nm-default-client.h"
 
-#include "nm-cloud-setup-utils.h"
+#include "nm-cloud-setup/nm-cloud-setup-utils.h"
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include "libnm-glib-aux/nm-test-utils.h"