discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=33ae9d51e63c22016be4f196ac0e5da9344153a4
commit 33ae9d51e63c22016be4f196ac0e5da9344153a4
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Wed Jul 24 09:01:32 2013 +0100
feature: add E_MODULE_SRC_PATH for setting current module src path without
needing to install modules
this is a useful feature when working on and debugging modules so that
contamination of the running system can be avoided
---
src/bin/e_module.c | 41 +++++++++++++++++++++++++++++++++++------
src/bin/e_module.h | 2 +-
2 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index cfc8903..b5981e1 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -33,6 +33,8 @@ static Eina_Hash *_e_module_path_hash = NULL;
EAPI int E_EVENT_MODULE_UPDATE = 0;
EAPI int E_EVENT_MODULE_INIT_END = 0;
+static Eina_Stringshare *mod_src_path = NULL;
+
static Eina_Bool
_module_filter_cb(void *d EINA_UNUSED, Eio_File *ls EINA_UNUSED, const
Eina_File_Direct_Info *info)
{
@@ -139,21 +141,33 @@ e_module_init(void)
{
Eina_List *module_paths;
E_Path_Dir *epd;
+ Eio_Monitor *mon;
+ Eio_File *ls;
+ if (_e_modules_hash) return 1;
E_EVENT_MODULE_UPDATE = ecore_event_type_new();
E_EVENT_MODULE_INIT_END = ecore_event_type_new();
_e_module_path_hash =
eina_hash_string_superfast_new((Eina_Free_Cb)eina_stringshare_del);
_e_modules_hash = eina_hash_string_superfast_new(NULL);
+ if (!mod_src_path)
+ mod_src_path = eina_stringshare_add(getenv("E_MODULE_SRC_PATH"));
+
E_LIST_HANDLER_APPEND(handlers, EIO_MONITOR_DIRECTORY_CREATED,
_module_monitor_dir_create, NULL);
E_LIST_HANDLER_APPEND(handlers, EIO_MONITOR_DIRECTORY_DELETED,
_module_monitor_dir_del, NULL);
E_LIST_HANDLER_APPEND(handlers, EIO_MONITOR_ERROR, _module_monitor_error,
NULL);
+ if (mod_src_path)
+ {
+ mon = eio_monitor_stringshared_add(mod_src_path);
+ ls = eio_file_direct_ls(mod_src_path, _module_filter_cb,
_module_main_cb, _module_done_cb, _module_error_cb, NULL);
+ _e_module_path_monitors = eina_list_append(_e_module_path_monitors,
mon);
+ _e_module_path_lists = eina_list_append(_e_module_path_lists, ls);
+ return 1;
+ }
module_paths = e_path_dir_list_get(path_modules);
EINA_LIST_FREE(module_paths, epd)
{
- Eio_Monitor *mon;
- Eio_File *ls;
void *data = NULL;
mon = eio_monitor_stringshared_add(epd->dir);
@@ -242,6 +256,7 @@ e_module_all_load(void)
E_Module *m;
if (!em->name) continue;
+ if (eina_hash_find(_e_modules_hash, em->name)) continue;
e_util_env_set("E_MODULE_LOAD", em->name);
snprintf(buf, sizeof(buf), _("Loading Module: %s"), em->name);
@@ -285,15 +300,23 @@ e_module_new(const char *name)
m = E_OBJECT_ALLOC(E_Module, E_MODULE_TYPE, _e_module_free);
if (name[0] != '/')
{
- Eina_Stringshare *path;
+ Eina_Stringshare *path = NULL;
- path = eina_hash_find(_e_module_path_hash, name);
+ if (!mod_src_path)
+ mod_src_path = eina_stringshare_add(getenv("E_MODULE_SRC_PATH"));
+ if (mod_src_path)
+ {
+ snprintf(buf, sizeof(buf), "%s/%s/.libs/module.so", mod_src_path,
name);
+ modpath = eina_stringshare_add(buf);
+ }
+ if (!modpath)
+ path = eina_hash_find(_e_module_path_hash, name);
if (path)
{
snprintf(buf, sizeof(buf), "%s/%s/module.so", path, MODULE_ARCH);
modpath = eina_stringshare_add(buf);
}
- else
+ else if (!modpath)
{
snprintf(buf, sizeof(buf), "%s/%s/module.so", name, MODULE_ARCH);
modpath = e_path_find(path_modules, buf);
@@ -745,7 +768,7 @@ _e_module_cb_dialog_disable(void *data, E_Dialog *dia)
static Eina_Bool
_e_module_cb_idler(void *data __UNUSED__)
{
- if (_e_modules_delayed)
+ while (_e_modules_delayed)
{
const char *name;
E_Module *m;
@@ -753,6 +776,11 @@ _e_module_cb_idler(void *data __UNUSED__)
name = eina_list_data_get(_e_modules_delayed);
_e_modules_delayed =
eina_list_remove_list(_e_modules_delayed, _e_modules_delayed);
+ if (eina_hash_find(_e_modules_hash, name))
+ {
+ eina_stringshare_del(name);
+ break;
+ }
m = NULL;
if (name) m = e_module_new(name);
if (m)
@@ -765,6 +793,7 @@ _e_module_cb_idler(void *data __UNUSED__)
e_module_enable(m);
}
eina_stringshare_del(name);
+ break;
}
if (_e_modules_delayed)
{
diff --git a/src/bin/e_module.h b/src/bin/e_module.h
index f12fabc..fea6997 100644
--- a/src/bin/e_module.h
+++ b/src/bin/e_module.h
@@ -1,6 +1,6 @@
#ifdef E_TYPEDEFS
-#define E_MODULE_API_VERSION 13
+#define E_MODULE_API_VERSION 14
typedef struct _E_Module E_Module;
typedef struct _E_Module_Api E_Module_Api;
--
