build: move "dispatcher/" to "src/nm-dispatcher/"

.gitignore

@@ -62,11 +62,11 @@ test-*.trs
 /contrib/fedora/rpm/latest0
 /contrib/fedora/rpm/latest
 
-/dispatcher/nm-avahi-autoipd.action
-/dispatcher/nm-dispatcher
-/dispatcher/nmdbus-dispatcher.*
-/dispatcher/org.freedesktop.nm_dispatcher.service
-/dispatcher/tests/test-dispatcher-envp
+/src/nm-dispatcher/nm-avahi-autoipd.action
+/src/nm-dispatcher/nm-dispatcher
+/src/nm-dispatcher/nmdbus-dispatcher.*
+/src/nm-dispatcher/org.freedesktop.nm_dispatcher.service
+/src/nm-dispatcher/tests/test-dispatcher-envp
 
 /clients/cli/nmcli
 /clients/cloud-setup/nm-cloud-setup
@@ -286,6 +286,11 @@ test-*.trs
 /clients/cli/settings-docs.c
 /clients/common/settings-docs.c
 /clients/common/tests/test-general
+/dispatcher/nm-avahi-autoipd.action
+/dispatcher/nm-dispatcher
+/dispatcher/nmdbus-dispatcher.*
+/dispatcher/org.freedesktop.nm_dispatcher.service
+/dispatcher/tests/test-dispatcher-envp
 /docs/libnm-glib/*.stamp
 /docs/libnm-glib/html/
 /docs/libnm-glib/libnm-glib-*.txt

Makefile.am

@@ -1292,8 +1292,8 @@ nm_core_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "s
 src/libnm-core-public/nm-core-enum-types.h.stamp:                           src/libnm-core-public/.dirstamp
 src/libnm-core-public/nm-core-enum-types.c.stamp:                           src/libnm-core-public/.dirstamp
 
-$(dispatcher_libnm_dispatcher_core_la_OBJECTS):                             $(src_libnm_core_public_mkenums_h)
-$(dispatcher_nm_dispatcher_OBJECTS):                                        $(src_libnm_core_public_mkenums_h)
+$(src_nm_dispatcher_libnm_dispatcher_core_la_OBJECTS):                      $(src_libnm_core_public_mkenums_h)
+$(src_nm_dispatcher_nm_dispatcher_OBJECTS):                                 $(src_libnm_core_public_mkenums_h)
 $(src_libnm_core_impl_libnm_core_impl_la_OBJECTS):                          $(src_libnm_core_public_mkenums_h)
 $(src_libnm_client_impl_libnm_la_OBJECTS):                                  $(src_libnm_core_public_mkenums_h)
 $(src_contrib_tests_libnm_vpn_plugin_utils_test_la_OBJECTS):                $(src_libnm_core_public_mkenums_h)
@@ -1708,8 +1708,8 @@ nm_enum_types_sources = \
 nm_enum_types_MKENUMS_H_FLAGS = --fhead '\#include "nm-core-enum-types.h"\n'
 nm_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "libnm-client-impl/nm-default-libnm.h"\n'
 
-$(dispatcher_nm_dispatcher_OBJECTS):                                    $(src_libnm_client_public_mkenums_h)
-$(dispatcher_libnm_dispatcher_core_la_OBJECTS):                         $(src_libnm_client_public_mkenums_h)
+$(src_nm_dispatcher_nm_dispatcher_OBJECTS):                             $(src_libnm_client_public_mkenums_h)
+$(src_nm_dispatcher_libnm_dispatcher_core_la_OBJECTS):                  $(src_libnm_client_public_mkenums_h)
 $(src_libnm_client_impl_libnm_la_OBJECTS):                              $(src_libnm_client_public_mkenums_h)
 $(src_contrib_tests_libnm_vpn_plugin_utils_test_la_OBJECTS):            $(src_libnm_client_public_mkenums_h)
 
@@ -4383,76 +4383,75 @@ EXTRA_DIST += \
 	src/core/tests/meson.build
 
 ###############################################################################
-# dispatcher
+# src/nm-dispatcher
 ###############################################################################
 
 dispatcher_nmdbus_dispatcher_sources = \
-	dispatcher/nmdbus-dispatcher.h \
-	dispatcher/nmdbus-dispatcher.c \
+	src/nm-dispatcher/nmdbus-dispatcher.h \
+	src/nm-dispatcher/nmdbus-dispatcher.c \
 	$(NULL)
 
-dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml
-	@$(MKDIR_P) dispatcher/
+src/nm-dispatcher/nmdbus-dispatcher.h: src/nm-dispatcher/nm-dispatcher.xml
+	@$(MKDIR_P) src/nm-dispatcher/
 	$(AM_V_GEN) gdbus-codegen \
 		--generate-c-code $(basename $@) \
 		--c-namespace NMDBus \
 		--interface-prefix org.freedesktop \
 		$<
 
-dispatcher/nmdbus-dispatcher.c: dispatcher/nmdbus-dispatcher.h
+src/nm-dispatcher/nmdbus-dispatcher.c: src/nm-dispatcher/nmdbus-dispatcher.h
 
 CLEANFILES += $(dispatcher_nmdbus_dispatcher_sources)
 
 ###############################################################################
 
-libexec_PROGRAMS += dispatcher/nm-dispatcher
+libexec_PROGRAMS += src/nm-dispatcher/nm-dispatcher
 
-noinst_LTLIBRARIES += \
-	dispatcher/libnm-dispatcher-core.la
+noinst_LTLIBRARIES += src/nm-dispatcher/libnm-dispatcher-core.la
 
 dispatcher_cppflags = \
 	$(dflt_cppflags) \
-	-I$(builddir)/dispatcher \
-	-I$(srcdir)/dispatcher \
 	-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 \
 	$(GLIB_CFLAGS) \
 	$(NULL)
 
-dispatcher_libnm_dispatcher_core_la_SOURCES = \
-	dispatcher/nm-dispatcher-utils.c \
-	dispatcher/nm-dispatcher-utils.h \
+src_nm_dispatcher_libnm_dispatcher_core_la_SOURCES = \
+	src/nm-dispatcher/nm-dispatcher-utils.c \
+	src/nm-dispatcher/nm-dispatcher-utils.h \
 	$(NULL)
 
-dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags)
+src_nm_dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags)
 
-dispatcher_libnm_dispatcher_core_la_LIBADD = \
+src_nm_dispatcher_libnm_dispatcher_core_la_LIBADD = \
 	src/libnm-client-impl/libnm.la \
 	$(GLIB_LIBS)
 
-dispatcher_nm_dispatcher_SOURCES = \
-	dispatcher/nm-dispatcher.c \
+src_nm_dispatcher_nm_dispatcher_SOURCES = \
+	src/nm-dispatcher/nm-dispatcher.c \
 	$(NULL)
 
-dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags)
+src_nm_dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags)
 
-dispatcher_nm_dispatcher_LDFLAGS = \
+src_nm_dispatcher_nm_dispatcher_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-dispatcher_nm_dispatcher_LDADD = \
-	dispatcher/libnm-dispatcher-core.la \
+src_nm_dispatcher_nm_dispatcher_LDADD = \
+	src/nm-dispatcher/libnm-dispatcher-core.la \
 	src/libnm-client-impl/libnm.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
 	src/libnm-std-aux/libnm-std-aux.la \
 	src/c-siphash/libc-siphash.la \
-	$(GLIB_LIBS)
+	$(GLIB_LIBS) \
+	$(NULL)
 
-dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freedesktop.nm_dispatcher.service.in
+src/nm-dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/src/nm-dispatcher/org.freedesktop.nm_dispatcher.service.in
 	@sed \
 	-e 's|@sbindir[@]|$(sbindir)|g' \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
@@ -4460,8 +4459,8 @@ dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freed
 	-e 's|@libexecdir[@]|$(libexecdir)|g' \
 	$< >$@
 
-dbusactivation_DATA += dispatcher/org.freedesktop.nm_dispatcher.service
-CLEANFILES += dispatcher/org.freedesktop.nm_dispatcher.service
+dbusactivation_DATA += src/nm-dispatcher/org.freedesktop.nm_dispatcher.service
+CLEANFILES += src/nm-dispatcher/org.freedesktop.nm_dispatcher.service
 
 install-data-hook-dispatcher:
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d
@@ -4475,51 +4474,50 @@ install-data-hook-dispatcher:
 
 install_data_hook += install-data-hook-dispatcher
 
-
-dbusservice_DATA += dispatcher/nm-dispatcher.conf
+dbusservice_DATA += src/nm-dispatcher/nm-dispatcher.conf
 
 EXTRA_DIST += \
-	dispatcher/nm-dispatcher.conf \
-	dispatcher/org.freedesktop.nm_dispatcher.service.in \
-	dispatcher/nm-dispatcher.xml \
-	dispatcher/meson.build
+	src/nm-dispatcher/nm-dispatcher.conf \
+	src/nm-dispatcher/org.freedesktop.nm_dispatcher.service.in \
+	src/nm-dispatcher/nm-dispatcher.xml \
+	src/nm-dispatcher/meson.build \
+	$(NULL)
 
 ###############################################################################
-# dispatcher/tests
+# src/nm-dispatcher/tests
 ###############################################################################
 
-check_programs += dispatcher/tests/test-dispatcher-envp
+check_programs += src/nm-dispatcher/tests/test-dispatcher-envp
 
-dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
+src_nm_dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
 	$(dflt_cppflags) \
-	-I$(srcdir)/dispatcher \
-	-I$(builddir)/dispatcher \
 	-I$(builddir)/src/libnm-core-public \
 	-I$(srcdir)/src/libnm-core-public \
 	-I$(srcdir)/src/libnm-client-public \
 	-I$(builddir)/src/libnm-client-public \
 	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(INTROSPECTION_EXTRA_CFLAGS) \
 	$(NULL)
 
-dispatcher_tests_test_dispatcher_envp_SOURCES = \
-	dispatcher/tests/test-dispatcher-envp.c \
+src_nm_dispatcher_tests_test_dispatcher_envp_SOURCES = \
+	src/nm-dispatcher/tests/test-dispatcher-envp.c \
 	$(NULL)
 
-nodist_dispatcher_tests_test_dispatcher_envp_SOURCES = $(dispatcher_nmdbus_dispatcher_sources)
+nodist_src_nm_dispatcher_tests_test_dispatcher_envp_SOURCES = $(dispatcher_nmdbus_dispatcher_sources)
 
-$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources)
-$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_client_public_mkenums_h)
+$(src_nm_dispatcher_tests_test_dispatcher_envp_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources)
+$(src_nm_dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h)
+$(src_nm_dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_client_public_mkenums_h)
 
-dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
+src_nm_dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-dispatcher_tests_test_dispatcher_envp_LDADD = \
-	dispatcher/libnm-dispatcher-core.la \
+src_nm_dispatcher_tests_test_dispatcher_envp_LDADD = \
+	src/nm-dispatcher/libnm-dispatcher-core.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
 	src/libnm-std-aux/libnm-std-aux.la \
 	src/c-siphash/libc-siphash.la \
@@ -4527,17 +4525,17 @@ dispatcher_tests_test_dispatcher_envp_LDADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h)
+$(src_nm_dispatcher_tests_test_dispatcher_envp_OBJECTS): $(src_libnm_core_public_mkenums_h)
 
 EXTRA_DIST += \
-	dispatcher/tests/dispatcher-connectivity-full \
-	dispatcher/tests/dispatcher-connectivity-unknown \
-	dispatcher/tests/dispatcher-down \
-	dispatcher/tests/dispatcher-external \
-	dispatcher/tests/dispatcher-up \
-	dispatcher/tests/dispatcher-vpn-down \
-	dispatcher/tests/dispatcher-vpn-up \
-	dispatcher/tests/meson.build \
+	src/nm-dispatcher/tests/dispatcher-connectivity-full \
+	src/nm-dispatcher/tests/dispatcher-connectivity-unknown \
+	src/nm-dispatcher/tests/dispatcher-down \
+	src/nm-dispatcher/tests/dispatcher-external \
+	src/nm-dispatcher/tests/dispatcher-up \
+	src/nm-dispatcher/tests/dispatcher-vpn-down \
+	src/nm-dispatcher/tests/dispatcher-vpn-up \
+	src/nm-dispatcher/tests/meson.build \
 	$(NULL)
 
 ###############################################################################

meson.build

@@ -920,7 +920,6 @@ content_files = []
 
 subdir('introspection')
 subdir('src')
-subdir('dispatcher')
 subdir('clients')
 subdir('data')
 subdir('po')

src/meson.build

@@ -86,6 +86,7 @@ subdir('libnm-client-public')
 subdir('libnm-client-impl')
 subdir('libnm-client-aux-extern')
 subdir('core')
+subdir('nm-dispatcher')
 subdir('contrib')
 
 if enable_tests
@@ -94,5 +95,6 @@ if enable_tests
   subdir('libnm-platform/tests')
   subdir('libnm-core-impl/tests')
   subdir('libnm-client-impl/tests')
+  subdir('nm-dispatcher/tests')
   subdir('contrib/tests')
 endif

src/nm-dispatcher/meson.build

@@ -14,6 +14,13 @@ install_data(
   install_dir: dbus_conf_dir,
 )
 
+dispatcher_nmdbus_dispatcher_sources = gnome.gdbus_codegen(
+  'nmdbus-dispatcher',
+  'nm-dispatcher.xml',
+  interface_prefix: 'org.freedesktop',
+  namespace: 'NMDBus',
+)
+
 libnm_dispatcher_core = static_library(
   'nm-dispatcher-core',
   sources: 'nm-dispatcher-utils.c',
@@ -22,13 +29,6 @@ libnm_dispatcher_core = static_library(
   ],
 )
 
-nmdbus_dispatcher_sources = gnome.gdbus_codegen(
-  'nmdbus-dispatcher',
-  'nm-dispatcher.xml',
-  interface_prefix: 'org.freedesktop',
-  namespace: 'NMDBus',
-)
-
 executable(
   'nm-dispatcher',
   'nm-dispatcher.c',
@@ -48,7 +48,3 @@ executable(
   install: true,
   install_dir: nm_libexecdir,
 )
-
-if enable_tests
-  subdir('tests')
-endif

src/nm-dispatcher/tests/dispatcher-down

@@ -17,7 +17,7 @@ NM_DISPATCHER_ACTION=down
 CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/dispatcher/tests/dispatcher-down
+CONNECTION_FILENAME=/src/nm-dispatcher/tests/dispatcher-down
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=wlan0
 

src/nm-dispatcher/tests/dispatcher-external

@@ -26,7 +26,7 @@ PATH=
 NM_DISPATCHER_ACTION=up
 CONNECTION_UUID=92bbc2fb-7304-46be-8ebb-6093dbe19a6a
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
-CONNECTION_FILENAME=/dispatcher/tests/dispatcher-external
+CONNECTION_FILENAME=/src/nm-dispatcher/tests/dispatcher-external
 CONNECTION_ID=virbr0
 CONNECTION_EXTERNAL=1
 DEVICE_IFACE=virbr0

src/nm-dispatcher/tests/dispatcher-up

@@ -40,7 +40,7 @@ NM_DISPATCHER_ACTION=up
 CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/dispatcher/tests/dispatcher-up
+CONNECTION_FILENAME=/src/nm-dispatcher/tests/dispatcher-up
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=wlan0
 PROXY_PAC_URL=http://networkmanager.com/proxy.pac

src/nm-dispatcher/tests/dispatcher-vpn-down

@@ -40,7 +40,7 @@ NM_DISPATCHER_ACTION=vpn-down
 CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/dispatcher/tests/dispatcher-vpn-down
+CONNECTION_FILENAME=/src/nm-dispatcher/tests/dispatcher-vpn-down
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=tun0
 PROXY_PAC_URL=http://networkmanager.com/proxy.pac

src/nm-dispatcher/tests/dispatcher-vpn-up

@@ -40,7 +40,7 @@ NM_DISPATCHER_ACTION=vpn-up
 CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/dispatcher/tests/dispatcher-vpn-up
+CONNECTION_FILENAME=/src/nm-dispatcher/tests/dispatcher-vpn-up
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=tun0
 PROXY_PAC_URL=http://networkmanager.com/proxy.pac

src/nm-dispatcher/tests/meson.build

@@ -4,13 +4,12 @@ exe = executable(
   'test-dispatcher-envp',
   [
     'test-dispatcher-envp.c',
-    nmdbus_dispatcher_sources,
+    dispatcher_nmdbus_dispatcher_sources,
   ],
   dependencies: [
     libnm_dep,
     glib_dep,
   ],
-  include_directories: dispatcher_inc,
   c_args: introspection_extra_cflags,
   link_with: [
     libnm_dispatcher_core,
@@ -21,7 +20,7 @@ exe = executable(
 )
 
 test(
-  'dispatcher/test-dispatcher-envp',
+  'src/nm-ddispatcher/test/test-dispatcher-envp',
   test_script,
   args: test_args + [exe.full_path()],
 )

src/nm-dispatcher/tests/test-dispatcher-envp.c

@@ -8,14 +8,14 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 
-#include "nm-dispatcher-utils.h"
+#include "nm-dispatcher/nm-dispatcher-utils.h"
 #include "libnm-core-aux-extern/nm-dispatcher-api.h"
 
 #include "libnm-glib-aux/nm-test-utils.h"
 
-#include "nmdbus-dispatcher.h"
+#include "nm-dispatcher/nmdbus-dispatcher.h"
 
-#define TEST_DIR NM_BUILD_SRCDIR "/dispatcher/tests"
+#define TEST_DIR NM_BUILD_SRCDIR "/src/nm-dispatcher/tests"
 
 /*****************************************************************************/
 
@@ -52,6 +52,7 @@ parse_main(GKeyFile *  kf,
     gs_free char *                                id    = NULL;
     gs_unref_object NMConnection *connection            = NULL;
     NMSettingConnection *         s_con;
+    const char *                  s;
 
     *out_expected_iface = g_key_file_get_string(kf, "main", "expected-iface", NULL);
 
@@ -84,7 +85,14 @@ parse_main(GKeyFile *  kf,
         g_variant_new_object_path("/org/freedesktop/NetworkManager/Connections/5"));
 
     /* Strip out the non-fixed portion of the filename */
-    filename = strstr(filename, "/dispatcher");
+    s        = filename;
+    filename = NULL;
+    while ((s = strstr(s, "/src/nm-dispatcher"))) {
+        filename = s;
+        s += 1;
+    }
+    g_assert(filename);
+    g_assert(g_str_has_prefix(filename, "/src/nm-dispatcher"));
     g_variant_builder_add(&props, "{sv}", "filename", g_variant_new_string(filename));
 
     if (g_key_file_get_boolean(kf, "main", "external", NULL)) {