build: introduce separate directories for plugin loaders and glib plugins

diff --git a/common.mk b/common.mk
index 49bdeb0..34542ec 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,2 +1,3 @@
 extensionsdir = $(pkglibdir)/extensions
-pluginsdir = $(pkglibdir)/plugins
+pluginloadersdir = $(pkglibdir)/pluginloaders
+gpluginsdir = $(pkglibdir)/gplugins

diff --git a/configure.ac b/configure.ac
index 8c39e9b..144af8c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -197,7 +197,7 @@ src/daemon/db/Makefile
 src/daemon/dbus/Makefile
 src/daemon/dbus/services/com.google.code.AccountsSSO.gSingleSignOn.service
 src/daemon/plugins/Makefile
-src/daemon/plugins/plugind/Makefile
+src/gplugind/Makefile
 src/extensions/Makefile
 src/extensions/test/Makefile
 src/extensions/tizen/Makefile

diff --git a/gsignond-uninstalled.pc.in b/gsignond-uninstalled.pc.in
index c17bca5..ca71657 100644 (file)
--- a/gsignond-uninstalled.pc.in
+++ b/gsignond-uninstalled.pc.in
@@ -6,7 +6,8 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@abs_top_builddir@/include
-pluginsdir=@libdir@/@PACKAGE@/plugins
+gpluginsdir=@libdir@/@PACKAGE@/gplugins
+pluginloadersdir = @libdir@/@PACKAGE@/pluginloaders
 extensionsdir=@libdir@/@PACKAGE@/extensions
 
 Name: @PACKAGE_NAME@

diff --git a/gsignond.pc.in b/gsignond.pc.in
index ae81423..7e23968 100644 (file)
--- a/gsignond.pc.in
+++ b/gsignond.pc.in
@@ -3,7 +3,8 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-pluginsdir=@libdir@/@PACKAGE@/plugins
+gpluginsdir=@libdir@/@PACKAGE@/gplugins
+pluginloadersdir = @libdir@/@PACKAGE@/pluginloaders
 extensionsdir=@libdir@/@PACKAGE@/extensions
 
 Name: @PACKAGE_NAME@

diff --git a/src/Makefile.am b/src/Makefile.am
index 3800c38..b5202ec 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS=common daemon extensions plugins
+SUBDIRS=common daemon gplugind extensions plugins
 

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index c419db8..40e3b5c 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -32,8 +32,7 @@ libgsignond_common_la_CPPFLAGS = \
     -I$(top_srcdir)/include \
     -I. \
     $(GSIGNOND_CFLAGS) \
-    -DGSIGNOND_PLUGINS_DIR='"$(pluginsdir)"' \
-    -DGSIGNOND_BIN_DIR='"$(bindir)"' \
+    -DGSIGNOND_GPLUGINS_DIR='"$(gpluginsdir)"' \
     -DGSIGNOND_SYSCONF_DIR='"$(sysconfdir)"' \
     $(NULL)
 

diff --git a/src/common/gsignond-plugin-loader.c b/src/common/gsignond-plugin-loader.c
index e55bb76..d31590b 100644 (file)
--- a/src/common/gsignond-plugin-loader.c
+++ b/src/common/gsignond-plugin-loader.c
@@ -36,12 +36,12 @@ gsignond_load_plugin(
         GSignondConfig* config,
         gchar* plugin_type)
 {
-    const gchar *plugin_path = GSIGNOND_PLUGINS_DIR;
+    const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR;
     gchar *plugin_filename;
     GSignondPlugin *plugin;
 
 #   ifdef ENABLE_DEBUG
-    const gchar *env_val = g_getenv("SSO_PLUGINS_DIR");
+    const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
     if (env_val)
         plugin_path = env_val;
 #   endif

diff --git a/src/daemon/plugins/Makefile.am b/src/daemon/plugins/Makefile.am
index 12f7be6..2b3e85c 100644 (file)
--- a/src/daemon/plugins/Makefile.am
+++ b/src/daemon/plugins/Makefile.am
@@ -1,5 +1,4 @@
 include $(top_srcdir)/common.mk
-SUBDIRS = plugind
 
 noinst_LTLIBRARIES = libgsignond-plugins.la
 
@@ -8,8 +7,8 @@ libgsignond_plugins_la_CPPFLAGS = \
     -I$(top_srcdir)/src \
     -I$(top_srcdir)/include \
     -I$(top_builddir)/src \
-    -DGSIGNOND_BIN_DIR='"$(bindir)"' \
-    -DGSIGNOND_PLUGINS_DIR='"$(pluginsdir)"' \
+    -DGSIGNOND_PLUGINLOADERS_DIR='"$(pluginloadersdir)"' \
+    -DGSIGNOND_GPLUGINS_DIR='"$(gpluginsdir)"' \
     $(GSIGNOND_CFLAGS)
 
 libgsignond_plugins_la_LIBADD =    \

diff --git a/src/daemon/plugins/gsignond-plugin-proxy-factory.c b/src/daemon/plugins/gsignond-plugin-proxy-factory.c
index aac3c7a..9b74548 100644 (file)
--- a/src/daemon/plugins/gsignond-plugin-proxy-factory.c
+++ b/src/daemon/plugins/gsignond-plugin-proxy-factory.c
@@ -49,10 +49,10 @@ static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
 
 static void _enumerate_plugins(GSignondPluginProxyFactory* self)
 {
-    const gchar *plugin_path = GSIGNOND_PLUGINS_DIR;
+    const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR;
 
 #   ifdef ENABLE_DEBUG
-    const gchar *env_val = g_getenv("SSO_PLUGINS_DIR");
+    const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
     if (env_val)
         plugin_path = env_val;
 #   endif

diff --git a/src/daemon/plugins/gsignond-plugin-remote.c b/src/daemon/plugins/gsignond-plugin-remote.c
index 84696f3..bc12063 100644 (file)
--- a/src/daemon/plugins/gsignond-plugin-remote.c
+++ b/src/daemon/plugins/gsignond-plugin-remote.c
@@ -562,14 +562,14 @@ gsignond_plugin_remote_new (
     GSignondPluginRemote *plugin = NULL;
     GSignondPipeStream *stream = NULL;
     gboolean ret = FALSE;
-    const gchar *bin_path = GSIGNOND_BIN_DIR;
-    const gchar *plugin_path = GSIGNOND_PLUGINS_DIR;
+    const gchar *bin_path = GSIGNOND_PLUGINLOADERS_DIR;
+    const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR;
 
 #   ifdef ENABLE_DEBUG
     const gchar *env_val = g_getenv("SSO_BIN_DIR");
     if (env_val)
         bin_path = env_val;
-    env_val = g_getenv("SSO_PLUGINS_DIR");
+    env_val = g_getenv("SSO_GPLUGINS_DIR");
     if (env_val)
         plugin_path = env_val;
 #   endif

diff --git a/src/daemon/plugins/plugind/Makefile.am b/src/gplugind/Makefile.am
similarity index 82%
rename from src/daemon/plugins/plugind/Makefile.am
rename to src/gplugind/Makefile.am
index 0ee89ff..8179ce0 100644 (file)
--- a/src/daemon/plugins/plugind/Makefile.am
+++ b/src/gplugind/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/common.mk
+
 SUBDIRS=
 NULL=
 
@@ -19,7 +21,7 @@ libgsignond_plugind_daemon_la_SOURCES = \
    gsignond-plugin-daemon.h \
    gsignond-plugin-daemon.c
 
-bin_PROGRAMS = gsignond-plugind
+pluginloaders_PROGRAMS = gsignond-plugind
 
 gsignond_plugind_SOURCES = \
     main.c \
@@ -41,4 +43,4 @@ all-local: slink
 
 slink:
        $(MKDIR_P) $(abs_top_builddir)/src/daemon/.libs
-       ln -sf $(abs_top_builddir)/src/daemon/plugins/plugind/.libs/gsignond-plugind $(abs_top_builddir)/src/daemon/.libs/gsignond-plugind
+       ln -sf $(abs_top_builddir)/src/gplugind/.libs/gsignond-plugind $(abs_top_builddir)/src/daemon/.libs/gsignond-plugind

diff --git a/src/daemon/plugins/plugind/gsignond-plugin-daemon.c b/src/gplugind/gsignond-plugin-daemon.c
similarity index 100%
rename from src/daemon/plugins/plugind/gsignond-plugin-daemon.c
rename to src/gplugind/gsignond-plugin-daemon.c

diff --git a/src/daemon/plugins/plugind/gsignond-plugin-daemon.h b/src/gplugind/gsignond-plugin-daemon.h
similarity index 100%
rename from src/daemon/plugins/plugind/gsignond-plugin-daemon.h
rename to src/gplugind/gsignond-plugin-daemon.h

diff --git a/src/daemon/plugins/plugind/main.c b/src/gplugind/main.c
similarity index 100%
rename from src/daemon/plugins/plugind/main.c
rename to src/gplugind/main.c

diff --git a/src/plugins/digest/Makefile.am b/src/plugins/digest/Makefile.am
index 67b2ac3..2c26c9c 100644 (file)
--- a/src/plugins/digest/Makefile.am
+++ b/src/plugins/digest/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/common.mk
-plugins_LTLIBRARIES = libdigest.la
+gplugins_LTLIBRARIES = libdigest.la
 NULL=
 
 libdigest_la_CPPFLAGS = \

diff --git a/src/plugins/password/Makefile.am b/src/plugins/password/Makefile.am
index d062e58..e9ccb7e 100644 (file)
--- a/src/plugins/password/Makefile.am
+++ b/src/plugins/password/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/common.mk
-plugins_LTLIBRARIES = libpassword.la
+gplugins_LTLIBRARIES = libpassword.la
 NULL=
 
 libpassword_la_CPPFLAGS = \

diff --git a/src/plugins/ssotest/Makefile.am b/src/plugins/ssotest/Makefile.am
index 85ecbcd..7316237 100644 (file)
--- a/src/plugins/ssotest/Makefile.am
+++ b/src/plugins/ssotest/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/common.mk
-plugins_LTLIBRARIES = libssotest.la
+gplugins_LTLIBRARIES = libssotest.la
 NULL=
 
 libssotest_la_CPPFLAGS = \

diff --git a/test/common/Makefile.am b/test/common/Makefile.am
index a43367c..07242ee 100644 (file)
--- a/test/common/Makefile.am
+++ b/test/common/Makefile.am
@@ -1,8 +1,8 @@
 TESTS = commontest
-TESTS_ENVIRONMENT= SSO_PLUGINS_DIR=$(top_builddir)/src/plugins/.libs \
+TESTS_ENVIRONMENT= SSO_GPLUGINS_DIR=$(top_builddir)/src/plugins/.libs \
     SSO_BIN_DIR=$(top_builddir)/src/daemon/.libs \
     SSO_STORAGE_PATH=/tmp/gsignond \
-    LD_LIBRARY_PATH="$(top_builddir)/src/daemon/plugins/plugind/.libs:$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs"
+    LD_LIBRARY_PATH="$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs"
 
 VALGRIND_TESTS_DISABLE=
 

diff --git a/test/daemon/Makefile.am b/test/daemon/Makefile.am
index cc7d789..d2230e9 100644 (file)
--- a/test/daemon/Makefile.am
+++ b/test/daemon/Makefile.am
@@ -1,8 +1,8 @@
 TESTS = daemontest
 
-TESTS_ENVIRONMENT= SSO_PLUGINS_DIR=$(top_builddir)/src/plugins/.libs \
+TESTS_ENVIRONMENT= SSO_GPLUGINS_DIR=$(top_builddir)/src/plugins/.libs \
        SSO_BIN_DIR=$(top_builddir)/src/daemon/.libs \
-       LD_LIBRARY_PATH="$(top_builddir)/src/daemon/plugins/plugind/.libs:$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs" 
+       LD_LIBRARY_PATH="$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs"
 
 VALGRIND_TESTS_DISABLE=
 

diff --git a/test/plugins/Makefile.am b/test/plugins/Makefile.am
index 4b77125..d45c02e 100644 (file)
--- a/test/plugins/Makefile.am
+++ b/test/plugins/Makefile.am
@@ -1,9 +1,9 @@
 TESTS = digestplugintest passwordplugintest pluginproxytest pluginremotetest
 
-TESTS_ENVIRONMENT= SSO_PLUGINS_DIR=$(top_builddir)/src/plugins/.libs \
+TESTS_ENVIRONMENT= SSO_GPLUGINS_DIR=$(top_builddir)/src/plugins/.libs \
        SSO_BIN_DIR=$(top_builddir)/src/daemon/.libs \
     SSO_STORAGE_PATH=/tmp/gsignond \
-    LD_LIBRARY_PATH="$(top_builddir)/src/daemon/plugins/plugind/.libs:$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs"
+    LD_LIBRARY_PATH="$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs"
 
 VALGRIND_TESTS_DISABLE =
     
@@ -62,12 +62,11 @@ pluginremotetest_CFLAGS = \
     -I$(top_builddir) \
     -I$(top_srcdir)/src \
     -I$(top_srcdir)/src/daemon/plugins \
-    -I$(top_srcdir)/src/daemon/plugins/plugind \
     -I$(top_srcdir)/include
 
 pluginremotetest_LDADD = \
     $(top_builddir)/src/common/libgsignond-common.la \
     $(top_builddir)/src/daemon/plugins/libgsignond-plugins.la \
-    $(top_builddir)/src/daemon/plugins/plugind/libgsignond-plugind-daemon.la \
+    $(top_builddir)/src/gplugind/libgsignond-plugind-daemon.la \
     $(GSIGNOND_LIBS) \
     $(CHECK_LIBS)

diff --git a/test/plugins/pluginremotetest.c b/test/plugins/pluginremotetest.c
index fde7565..c861f12 100644 (file)
--- a/test/plugins/pluginremotetest.c
+++ b/test/plugins/pluginremotetest.c
@@ -30,7 +30,7 @@
 #include "daemon/gsignond-types.h"
 #include "gsignond-plugin-remote-private.h"
 #include "gsignond-plugin-remote.h"
-#include "plugind/gsignond-plugin-daemon.h"
+#include "gplugind/gsignond-plugin-daemon.h"
 #include <gsignond/gsignond-plugin-interface.h>
 #include <gsignond/gsignond-error.h>
 #include <gsignond/gsignond-config.h>
@@ -533,7 +533,7 @@ START_TEST (test_plugind_daemon)
     GSignondPluginDaemon *daemon = NULL;
     const gchar *plugin_type = "password";
 
-    const gchar *plugin_dir = g_getenv("SSO_PLUGINS_DIR");
+    const gchar *plugin_dir = g_getenv("SSO_GPLUGINS_DIR");
     fail_if (plugin_dir == NULL);
 
     gchar *plugin_path = g_module_build_path (plugin_dir, "nonexisting");

diff --git a/tools/setup-and-start-daemon.sh b/tools/setup-and-start-daemon.sh
index af71ca8..8795cc6 100755 (executable)
--- a/tools/setup-and-start-daemon.sh
+++ b/tools/setup-and-start-daemon.sh
@@ -23,7 +23,7 @@ else
 export SSO_KEYCHAIN_SYSCTX="$SRC_HOME/test/daemon/.libs/daemontest"
 fi
 export SSO_BIN_DIR=$SRC_HOME/src/daemon/.libs
-export SSO_PLUGINS_DIR=$SRC_HOME/src/plugins/.libs 
+export SSO_GPLUGINS_DIR=$SRC_HOME/src/plugins/.libs
 export LD_LIBRARY_PATH="$SRC_HOME/src/daemon/plugins/plugind/.libs:$SRC_HOME/src/daemon/plugins/.libs"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SRC_HOME/src/common/.libs:$SRC_HOME/src/common/db/.libs:$SRC_HOME/src/daemon/.libs:$SRC_HOME/src/daemon/db/.libs:$SRC_HOME/src/daemon/dbus/.libs"
 export G_MESSAGES_DEBUG="all"