From 4b288136e1893a7ac21f04370008e37feb3cfac9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 15 Jun 2016 15:29:10 +0200 Subject: [PATCH] shared: move shared files to subdirectory "shared/nm-utils/" The "shared" directory contains files that are possibly used by all components of NetworkManager repository. Some of these files are even copied as-is to other projects (VPN plugins, nm-applet) and used there without modification. Move those files to a separate directory. By moving them to a common directory, it is clearer that they belong together. Also, you can easier compare the copied versions to their original via $ diff -r ./shared/nm-utils/ /path/to/nm-vpn-plugin/shared/nm-utils/ --- callouts/tests/test-dispatcher-envp.c | 2 +- libnm-core/Makefile.libnm-core | 4 ++-- libnm-core/tests/test-compare.c | 2 +- libnm-core/tests/test-crypto.c | 2 +- libnm-core/tests/test-general.c | 2 +- libnm-core/tests/test-keyfile.c | 2 +- libnm-core/tests/test-secrets.c | 2 +- libnm-core/tests/test-setting-8021x.c | 2 +- libnm-core/tests/test-setting-bond.c | 2 +- libnm-core/tests/test-setting-dcb.c | 2 +- libnm-core/tests/test-settings-defaults.c | 2 +- libnm-util/Makefile.am | 4 ++-- libnm-util/tests/test-crypto.c | 2 +- libnm-util/tests/test-general.c | 2 +- libnm-util/tests/test-secrets.c | 2 +- libnm-util/tests/test-setting-8021x.c | 2 +- libnm-util/tests/test-setting-dcb.c | 2 +- libnm-util/tests/test-settings-defaults.c | 2 +- libnm/nm-vpn-service-plugin.c | 2 +- po/POTFILES.in | 2 +- po/POTFILES.skip | 2 +- shared/Makefile.am | 15 ++++++++------- shared/nm-default.h | 8 ++++---- shared/nm-test-libnm-utils.h | 2 +- shared/{ => nm-utils}/gsystem-local-alloc.h | 0 shared/{ => nm-utils}/nm-glib.h | 0 shared/{ => nm-utils}/nm-macros-internal.h | 0 shared/{ => nm-utils}/nm-shared-utils.c | 0 shared/{ => nm-utils}/nm-shared-utils.h | 0 shared/{ => nm-utils}/nm-test-utils.h | 0 shared/{ => nm-utils}/nm-vpn-editor-plugin-call.h | 0 src/nm-test-utils-core.h | 2 +- 32 files changed, 37 insertions(+), 36 deletions(-) rename shared/{ => nm-utils}/gsystem-local-alloc.h (100%) rename shared/{ => nm-utils}/nm-glib.h (100%) rename shared/{ => nm-utils}/nm-macros-internal.h (100%) rename shared/{ => nm-utils}/nm-shared-utils.c (100%) rename shared/{ => nm-utils}/nm-shared-utils.h (100%) rename shared/{ => nm-utils}/nm-test-utils.h (100%) rename shared/{ => nm-utils}/nm-vpn-editor-plugin-call.h (100%) diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c index 9cdaa3b5c6..83e84d7472 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/callouts/tests/test-dispatcher-envp.c @@ -28,7 +28,7 @@ #include "nm-dispatcher-utils.h" #include "nm-dispatcher-api.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" /*******************************************/ diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core index 0038ce23d6..52c71da5b7 100644 --- a/libnm-core/Makefile.libnm-core +++ b/libnm-core/Makefile.libnm-core @@ -52,7 +52,7 @@ libnm_core_headers = \ $(core)/nm-vpn-plugin-info.h libnm_core_private_headers = \ - $(top_builddir)/shared/nm-shared-utils.h \ + $(top_builddir)/shared/nm-utils/nm-shared-utils.h \ $(core)/crypto.h \ $(core)/nm-connection-private.h \ $(core)/nm-core-internal.h \ @@ -64,7 +64,7 @@ libnm_core_private_headers = \ $(core)/nm-utils-private.h libnm_core_sources = \ - $(top_builddir)/shared/nm-shared-utils.c \ + $(top_builddir)/shared/nm-utils/nm-shared-utils.c \ $(core_build)/nm-core-enum-types.c \ $(core)/crypto.c \ $(core)/nm-connection.c \ diff --git a/libnm-core/tests/test-compare.c b/libnm-core/tests/test-compare.c index dca5c7d3d1..7f2ba98095 100644 --- a/libnm-core/tests/test-compare.c +++ b/libnm-core/tests/test-compare.c @@ -26,7 +26,7 @@ #include "nm-property-compare.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" static void compare_ints (void) diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c index bd87c710ca..9bab985f72 100644 --- a/libnm-core/tests/test-crypto.c +++ b/libnm-core/tests/test-crypto.c @@ -33,7 +33,7 @@ #include "nm-errors.h" #include "nm-core-internal.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" #if 0 static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----"; diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 39e9c1aff3..9aaf82977d 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -62,7 +62,7 @@ #include "test-general-enums.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" /* When passing a "bool" typed argument to a variadic function that * expects a gboolean, the compiler will promote the integer type diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c index 92b6c1f56c..ecb7cd5a67 100644 --- a/libnm-core/tests/test-keyfile.c +++ b/libnm-core/tests/test-keyfile.c @@ -28,7 +28,7 @@ #include "nm-setting-wired.h" #include "nm-setting-8021x.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" #define TEST_WIRED_TLS_CA_CERT TEST_CERT_DIR"/test-ca-cert.pem" diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c index 7b37d09e92..0149348dbe 100644 --- a/libnm-core/tests/test-secrets.c +++ b/libnm-core/tests/test-secrets.c @@ -38,7 +38,7 @@ #include "nm-utils.h" #include "nm-core-internal.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" #define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem" #define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem" diff --git a/libnm-core/tests/test-setting-8021x.c b/libnm-core/tests/test-setting-8021x.c index 56563a6fb6..268a9f52d9 100644 --- a/libnm-core/tests/test-setting-8021x.c +++ b/libnm-core/tests/test-setting-8021x.c @@ -27,7 +27,7 @@ #include "nm-setting-connection.h" #include "nm-setting-8021x.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" static void compare_blob_data (const char *test, diff --git a/libnm-core/tests/test-setting-bond.c b/libnm-core/tests/test-setting-bond.c index a6afa1c865..91a8199719 100644 --- a/libnm-core/tests/test-setting-bond.c +++ b/libnm-core/tests/test-setting-bond.c @@ -26,7 +26,7 @@ #include "nm-setting-connection.h" #include "nm-errors.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" static void create_bond_connection (NMConnection **con, NMSettingBond **s_bond) diff --git a/libnm-core/tests/test-setting-dcb.c b/libnm-core/tests/test-setting-dcb.c index 09cf8d9837..55c1c5162c 100644 --- a/libnm-core/tests/test-setting-dcb.c +++ b/libnm-core/tests/test-setting-dcb.c @@ -28,7 +28,7 @@ #include "nm-connection.h" #include "nm-errors.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" #define DCB_FLAGS_ALL (NM_SETTING_DCB_FLAG_ENABLE | \ NM_SETTING_DCB_FLAG_ADVERTISE | \ diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c index 366910ac2a..95570b0380 100644 --- a/libnm-core/tests/test-settings-defaults.c +++ b/libnm-core/tests/test-settings-defaults.c @@ -38,7 +38,7 @@ #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" static void test_defaults (GType type, const char *name) diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 0d5a0d46c1..466e475f23 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -62,7 +62,7 @@ nodist_libnm_util_include_HEADERS = \ nm-utils-enum-types.h libnm_util_la_private_headers = \ - $(top_builddir)/shared/nm-shared-utils.h \ + $(top_builddir)/shared/nm-utils/nm-shared-utils.h \ crypto.h \ nm-dbus-glib-types.h \ nm-gvaluearray-compat.h \ @@ -71,7 +71,7 @@ libnm_util_la_private_headers = \ nm-utils-private.h libnm_util_la_csources = \ - $(top_builddir)/shared/nm-shared-utils.c \ + $(top_builddir)/shared/nm-utils/nm-shared-utils.c \ crypto.c \ nm-connection.c \ nm-param-spec-specialized.c \ diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c index a1c7648fce..643418d2fb 100644 --- a/libnm-util/tests/test-crypto.c +++ b/libnm-util/tests/test-crypto.c @@ -31,7 +31,7 @@ #include "crypto.h" #include "nm-utils.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" #if 0 static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----"; diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index 10fed337f3..8373ae1197 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -47,7 +47,7 @@ #include "nm-utils.h" #include "nm-dbus-glib-types.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" static void vpn_check_func (const char *key, const char *value, gpointer user_data) diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c index 0d451788e5..2631509cf3 100644 --- a/libnm-util/tests/test-secrets.c +++ b/libnm-util/tests/test-secrets.c @@ -37,7 +37,7 @@ #include "nm-setting-pppoe.h" #include "nm-setting-vpn.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" #define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem" #define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem" diff --git a/libnm-util/tests/test-setting-8021x.c b/libnm-util/tests/test-setting-8021x.c index e5bddf4cd9..a0219639c5 100644 --- a/libnm-util/tests/test-setting-8021x.c +++ b/libnm-util/tests/test-setting-8021x.c @@ -27,7 +27,7 @@ #include "nm-setting-connection.h" #include "nm-setting-8021x.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" static void compare_blob_data (const char *test, diff --git a/libnm-util/tests/test-setting-dcb.c b/libnm-util/tests/test-setting-dcb.c index fb44278b6c..ee0c997fb1 100644 --- a/libnm-util/tests/test-setting-dcb.c +++ b/libnm-util/tests/test-setting-dcb.c @@ -27,7 +27,7 @@ #include "nm-default.h" #include "nm-setting-dcb.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" #define DCB_FLAGS_ALL (NM_SETTING_DCB_FLAG_ENABLE | \ NM_SETTING_DCB_FLAG_ADVERTISE | \ diff --git a/libnm-util/tests/test-settings-defaults.c b/libnm-util/tests/test-settings-defaults.c index 95ff070955..0bd4feee58 100644 --- a/libnm-util/tests/test-settings-defaults.c +++ b/libnm-util/tests/test-settings-defaults.c @@ -38,7 +38,7 @@ #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" static void test_defaults (GType type, const char *name) diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index df99eb28d9..6431629669 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -1312,5 +1312,5 @@ nm_vpn_service_plugin_initable_iface_init (GInitableIface *iface) /* this header is intended to be copied to users of nm_vpn_editor_plugin_call(), * to simplify invocation of generic functions. Include it here, to complile * the code. */ -#include "nm-vpn-editor-plugin-call.h" +#include "nm-utils/nm-vpn-editor-plugin-call.h" diff --git a/po/POTFILES.in b/po/POTFILES.in index ded6d5d549..7d1d1ba331 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -140,7 +140,7 @@ libnm/nm-remote-settings.c libnm/nm-vpn-plugin-old.c libnm/nm-vpn-service-plugin.c policy/org.freedesktop.NetworkManager.policy.in.in -shared/nm-shared-utils.c +shared/nm-utils/nm-shared-utils.c src/NetworkManagerUtils.c src/main.c src/main-utils.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 842f22a568..7bf60bea5b 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -6,6 +6,6 @@ vpn-daemons/openvpn vpn-daemons/pptp vpn-daemons/vpnc contrib/fedora/rpm/ -shared/nm-vpn-editor-plugin-call.h +shared/nm-utils/nm-vpn-editor-plugin-call.h # https://bugs.launchpad.net/intltool/+bug/1117944 sub/policy/org.freedesktop.NetworkManager.policy.in diff --git a/shared/Makefile.am b/shared/Makefile.am index 01818d0cd1..41df29a32b 100644 --- a/shared/Makefile.am +++ b/shared/Makefile.am @@ -1,16 +1,17 @@ EXTRA_DIST = \ - gsystem-local-alloc.h \ + nm-utils/gsystem-local-alloc.h \ + nm-utils/nm-glib.h \ + nm-utils/nm-macros-internal.h \ + nm-utils/nm-shared-utils.c \ + nm-utils/nm-shared-utils.h \ + nm-utils/nm-test-utils.h \ + nm-utils/nm-vpn-editor-plugin-call.h \ nm-common-macros.h \ nm-dbus-compat.h \ nm-default.h \ - nm-glib.h \ - nm-macros-internal.h \ - nm-shared-utils.c \ - nm-shared-utils.h \ nm-test-libnm-utils.h \ - nm-test-utils.h \ nm-test-utils-impl.c \ nm-version-macros.h.in \ - nm-vpn-editor-plugin-call.h + $(NULL) CLEANFILES=nm-version.h diff --git a/shared/nm-default.h b/shared/nm-default.h index 5d7c8f141c..bcd3d420c2 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -98,11 +98,11 @@ _nm_g_return_if_fail_warning (const char *log_domain, /*****************************************************************************/ -#include "nm-glib.h" +#include "nm-utils/nm-glib.h" #include "nm-version.h" -#include "gsystem-local-alloc.h" -#include "nm-macros-internal.h" -#include "nm-shared-utils.h" +#include "nm-utils/gsystem-local-alloc.h" +#include "nm-utils/nm-macros-internal.h" +#include "nm-utils/nm-shared-utils.h" /*****************************************************************************/ diff --git a/shared/nm-test-libnm-utils.h b/shared/nm-test-libnm-utils.h index 8d111003aa..192c089e10 100644 --- a/shared/nm-test-libnm-utils.h +++ b/shared/nm-test-libnm-utils.h @@ -20,7 +20,7 @@ #include "NetworkManager.h" -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" /*****************************************************************************/ diff --git a/shared/gsystem-local-alloc.h b/shared/nm-utils/gsystem-local-alloc.h similarity index 100% rename from shared/gsystem-local-alloc.h rename to shared/nm-utils/gsystem-local-alloc.h diff --git a/shared/nm-glib.h b/shared/nm-utils/nm-glib.h similarity index 100% rename from shared/nm-glib.h rename to shared/nm-utils/nm-glib.h diff --git a/shared/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h similarity index 100% rename from shared/nm-macros-internal.h rename to shared/nm-utils/nm-macros-internal.h diff --git a/shared/nm-shared-utils.c b/shared/nm-utils/nm-shared-utils.c similarity index 100% rename from shared/nm-shared-utils.c rename to shared/nm-utils/nm-shared-utils.c diff --git a/shared/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h similarity index 100% rename from shared/nm-shared-utils.h rename to shared/nm-utils/nm-shared-utils.h diff --git a/shared/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h similarity index 100% rename from shared/nm-test-utils.h rename to shared/nm-utils/nm-test-utils.h diff --git a/shared/nm-vpn-editor-plugin-call.h b/shared/nm-utils/nm-vpn-editor-plugin-call.h similarity index 100% rename from shared/nm-vpn-editor-plugin-call.h rename to shared/nm-utils/nm-vpn-editor-plugin-call.h diff --git a/src/nm-test-utils-core.h b/src/nm-test-utils-core.h index 8fd3be55ae..f5118398d3 100644 --- a/src/nm-test-utils-core.h +++ b/src/nm-test-utils-core.h @@ -26,7 +26,7 @@ #define _NMTST_INSIDE_CORE 1 -#include "nm-test-utils.h" +#include "nm-utils/nm-test-utils.h" /*****************************************************************************/