From 6ad3256a01dc1b7c83a4fece3ddbbc0384e5b76c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sat, 22 May 2010 07:04:00 +0000 Subject: [PATCH] completely change directory structure, lib name, includes, don't even bother trying to use this unless your e is the latest version SVN revision: 49129 --- legacy/eeze/Makefile.am | 6 +- legacy/eeze/README | 2 +- legacy/eeze/configure.ac | 35 ++---------- legacy/eeze/doc/eeze.dox.in | 7 +-- legacy/eeze/{eeze_udev.pc.in => eeze.pc.in} | 6 +- legacy/eeze/src/bin/Makefile.am | 8 +-- legacy/eeze/src/bin/eeze_udev_test.c | 8 +-- .../eeze/src/lib/{udev/Eeze_Udev.h => Eeze.h} | 4 +- legacy/eeze/src/lib/Makefile.am | 21 ++++++- legacy/eeze/src/lib/eeze_main.c | 57 +++++++++++++++++++ legacy/eeze/src/lib/eeze_private.h | 25 ++++++++ legacy/eeze/src/lib/{udev => }/eeze_udev.c | 3 +- .../eeze/src/lib/{udev => }/eeze_udev_find.c | 3 +- .../src/lib/{udev => }/eeze_udev_private.c | 3 +- .../src/lib/{udev => }/eeze_udev_private.h | 23 +------- .../eeze/src/lib/{udev => }/eeze_udev_walk.c | 3 +- .../eeze/src/lib/{udev => }/eeze_udev_watch.c | 3 +- legacy/eeze/src/lib/udev/Makefile.am | 24 -------- legacy/eeze/src/lib/udev/eeze_udev_main.c | 56 ------------------ 19 files changed, 134 insertions(+), 163 deletions(-) rename legacy/eeze/{eeze_udev.pc.in => eeze.pc.in} (64%) rename legacy/eeze/src/lib/{udev/Eeze_Udev.h => Eeze.h} (97%) create mode 100644 legacy/eeze/src/lib/eeze_main.c create mode 100644 legacy/eeze/src/lib/eeze_private.h rename legacy/eeze/src/lib/{udev => }/eeze_udev.c (99%) rename legacy/eeze/src/lib/{udev => }/eeze_udev_find.c (99%) rename legacy/eeze/src/lib/{udev => }/eeze_udev_private.c (98%) rename legacy/eeze/src/lib/{udev => }/eeze_udev_private.h (51%) rename legacy/eeze/src/lib/{udev => }/eeze_udev_walk.c (98%) rename legacy/eeze/src/lib/{udev => }/eeze_udev_watch.c (99%) delete mode 100644 legacy/eeze/src/lib/udev/Makefile.am delete mode 100644 legacy/eeze/src/lib/udev/eeze_udev_main.c diff --git a/legacy/eeze/Makefile.am b/legacy/eeze/Makefile.am index d0319f4e24..400b3b08b8 100644 --- a/legacy/eeze/Makefile.am +++ b/legacy/eeze/Makefile.am @@ -10,10 +10,8 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in* \ pkgconfigdir = $(libdir)/pkgconfig -if BUILD_EEZE_UDEV -EEZE_UDEV_PC = eeze_udev.pc -endif -pkgconfig_DATA = $(EEZE_UDEV_PC) +EEZE_PC = eeze.pc +pkgconfig_DATA = $(EEZE_PC) .PHONY: doc diff --git a/legacy/eeze/README b/legacy/eeze/README index 01644b4c34..5e3ab0ec81 100644 --- a/legacy/eeze/README +++ b/legacy/eeze/README @@ -1,3 +1,3 @@ eeze v?.?? -eeze is a collection of libraries that simplify the use of devices. Dependencies may vary, use at your own risk, i before e except after c. +eeze is a library to simplify the use of devices. Dependencies may vary, use at your own risk, i before e except after c. diff --git a/legacy/eeze/configure.ac b/legacy/eeze/configure.ac index 30da2c395b..81a0f9ad71 100644 --- a/legacy/eeze/configure.ac +++ b/legacy/eeze/configure.ac @@ -1,7 +1,7 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT([eeze], [0.4.0], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([eeze], [0.5.0], [enlightenment-devel@lists.sourceforge.net]) release="ver-pre-svn-05" AC_PREREQ([2.52]) AC_CONFIG_SRCDIR([configure.ac]) @@ -25,24 +25,10 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'` VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'` SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'` version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN" -eeze_udev_release_info="-release $release" +eeze_release_info="-release $release" AC_SUBST(version_info) -AC_SUBST(eeze_udev_release_info) +AC_SUBST(eeze_release_info) -modules="" -dnl Check enabled modules to build -AC_ARG_ENABLE([udev],[AC_HELP_STRING([--disable-udev], [Disable eeze_udev build])]) -AS_IF( - [test "x$enableval" != "xno"], - modules+="udev" - [enable_eeze_udev="yes"], - [enable_eeze_udev=no], -) - -if test -z $modules;then - AC_MSG_ERROR(you have not selected any modules to build!) -fi -# pkg-config PKG_PROG_PKG_CONFIG # Check whether pkg-config supports Requires.private @@ -54,11 +40,7 @@ AS_IF( AC_SUBST(pkgconfig_requires_private) PKG_CHECK_MODULES([ECORE], [ecore]) - -AS_IF( - [test "x${enable_eeze_udev}" = "xyes"], - [PKG_CHECK_MODULES(UDEV, libudev, [], [enable_eeze_udev="no"])] -) +PKG_CHECK_MODULES(UDEV, libudev) udev_version=$(pkg-config libudev --modversion) @@ -67,9 +49,6 @@ if test $udev_version -lt 142;then AC_DEFINE([OLD_UDEV_RRRRRRRRRRRRRR],[1],[compat functionality for udev < 142]) fi -AM_CONDITIONAL([BUILD_EEZE_UDEV], [test "x${enable_eeze_udev}" = "xyes"]) - -EFL_EDBUS_BUILD="" lt_enable_auto_import="" AS_CASE( ["$host_os"], @@ -85,9 +64,8 @@ doc/eeze.dox doc/Makefile src/Makefile src/lib/Makefile -src/lib/udev/Makefile src/bin/Makefile -eeze_udev.pc +eeze.pc ]) @@ -103,9 +81,6 @@ echo "------------------------------------------------------------------------" echo echo "Configuration Options Summary:" echo -echo " Modules:" -echo -echo " Eeze_Udev..............: $enable_eeze_udev" echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" diff --git a/legacy/eeze/doc/eeze.dox.in b/legacy/eeze/doc/eeze.dox.in index d09a56f8dd..1f39bb68bd 100644 --- a/legacy/eeze/doc/eeze.dox.in +++ b/legacy/eeze/doc/eeze.dox.in @@ -1,6 +1,6 @@ /** @file eeze.dox -@brief Eeze Misc Libraries +@brief Eeze Device Library */ /** @@ -12,10 +12,7 @@ @section intro What is Eeze? -Eeze is a collection of various APIs which may or may not be useful -to developers working with EFL. The aim is to eliminate the need to -learn any api outside of EFL while simultaneously providing an -extremely easy way to manipulate external libraries. +Eeze is a library for easily manipulating devices. @verbatim Pants diff --git a/legacy/eeze/eeze_udev.pc.in b/legacy/eeze/eeze.pc.in similarity index 64% rename from legacy/eeze/eeze_udev.pc.in rename to legacy/eeze/eeze.pc.in index 1e2e57578b..f13be24785 100644 --- a/legacy/eeze/eeze_udev.pc.in +++ b/legacy/eeze/eeze.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: eeze_udev -Description: udev convenience library for efl +Name: eeze +Description: device convenience library for efl @pkgconfig_requires_private@: ecore libudev Version: @VERSION@ -Libs: -L${libdir} -leeze_udev +Libs: -L${libdir} -leeze Cflags: -I${includedir} diff --git a/legacy/eeze/src/bin/Makefile.am b/legacy/eeze/src/bin/Makefile.am index cba60d5c06..3a6b3b419c 100644 --- a/legacy/eeze/src/bin/Makefile.am +++ b/legacy/eeze/src/bin/Makefile.am @@ -1,21 +1,17 @@ MAINTAINERCLEANFILES = Makefile.in EEZE_CPPFLAGS = \ --I$(top_srcdir)/src/lib/udev \ +-I$(top_srcdir)/src/lib \ @ECORE_CFLAGS@ LIBS = \ @ECORE_LIBS@ -if BUILD_EEZE_UDEV EEZE_UDEV_PROG = eeze_udev_test -endif bin_PROGRAMS = \ $(EEZE_UDEV_PROG) -if BUILD_EEZE_UDEV eeze_udev_test_SOURCES = eeze_udev_test.c eeze_udev_test_CPPFLAGS = $(EEZE_CPPFLAGS) -eeze_udev_test_LDADD = $(top_builddir)/src/lib/udev/libeeze_udev.la -endif +eeze_udev_test_LDADD = $(top_builddir)/src/lib/libeeze.la diff --git a/legacy/eeze/src/bin/eeze_udev_test.c b/legacy/eeze/src/bin/eeze_udev_test.c index 1bc0513b31..a9abf2bb38 100644 --- a/legacy/eeze/src/bin/eeze_udev_test.c +++ b/legacy/eeze/src/bin/eeze_udev_test.c @@ -1,10 +1,10 @@ -#include +#include #include #include /** - * This demo program shows how to use some eeze functions. It roughly + * This demo program shows how to use some eeze_udev functions. It roughly * 1kb as of now, TODO is to fix this but I'm too lazy now and it's only * a demo. */ @@ -69,7 +69,7 @@ end: /* and delete the watch */ eeze_udev_watch_del(watch); /* and shut down eudev */ - eeze_udev_shutdown(); + eeze_shutdown(); /* and quit the main loop */ ecore_main_loop_quit(); } @@ -88,7 +88,7 @@ int main() Eina_Hash *hash; ecore_init(); - eeze_udev_init(); + eeze_init(); hash = eina_hash_stringshared_new(hash_free); akbdmouse = malloc(sizeof(kbdmouse)); diff --git a/legacy/eeze/src/lib/udev/Eeze_Udev.h b/legacy/eeze/src/lib/Eeze.h similarity index 97% rename from legacy/eeze/src/lib/udev/Eeze_Udev.h rename to legacy/eeze/src/lib/Eeze.h index 069d62d0dc..2fc82c8bd6 100644 --- a/legacy/eeze/src/lib/udev/Eeze_Udev.h +++ b/legacy/eeze/src/lib/Eeze.h @@ -117,8 +117,8 @@ typedef struct Eeze_Udev_Watch Eeze_Udev_Watch; extern "C" { #endif - EAPI int eeze_udev_init(void); - EAPI int eeze_udev_shutdown(void); + EAPI int eeze_init(void); + EAPI int eeze_shutdown(void); EAPI Eina_List *eeze_udev_find_similar_from_syspath(const char *syspath); EAPI void eeze_udev_find_unlisted_similar(Eina_List *list); diff --git a/legacy/eeze/src/lib/Makefile.am b/legacy/eeze/src/lib/Makefile.am index 240797d51d..15aa7975d7 100644 --- a/legacy/eeze/src/lib/Makefile.am +++ b/legacy/eeze/src/lib/Makefile.am @@ -1,2 +1,21 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS=udev + +AM_CPPFLAGS = @ECORE_CFLAGS@ + +lib_LTLIBRARIES = libeeze.la +include_HEADERS = Eeze.h + +noinst_HEADERS = eeze_udev_private.h eeze_private.h + +libeeze_la_SOURCES = \ +Eeze.h \ +eeze_udev.c \ +eeze_udev_watch.c \ +eeze_main.c \ +eeze_udev_find.c \ +eeze_udev_walk.c \ +eeze_udev_private.c + +libeeze_la_LIBADD = @ECORE_LIBS@ @UDEV_LIBS@ +libeeze_la_LDFLAGS = -no-undefined -version-info @version_info@ @eeze_release_info@ + diff --git a/legacy/eeze/src/lib/eeze_main.c b/legacy/eeze/src/lib/eeze_main.c new file mode 100644 index 0000000000..b9628ade7a --- /dev/null +++ b/legacy/eeze/src/lib/eeze_main.c @@ -0,0 +1,57 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include "eeze_private.h" +#include "eeze_udev_private.h" + +_udev *udev; + +int _eeze_log_dom = -1; +int _eeze_init_count = 0; + +EAPI int +eeze_init(void) +{ + if (++_eeze_init_count != 1) + return _eeze_init_count; + + if (!eina_init()) + return --_eeze_init_count; + + _eeze_log_dom = eina_log_domain_register + ("eeze_udev", eeze_COLOR_DEFAULT); + + if (_eeze_log_dom < 0) + { + EINA_LOG_ERR("Could not register 'eeze_udev' log domain."); + goto fail; + } + + if (!((udev) = udev_new())) + { + EINA_LOG_ERR("Could not initialize udev library!"); + goto fail; + } + + return _eeze_init_count; +fail: + eina_log_domain_unregister(_eeze_log_dom); + _eeze_log_dom = -1; + eina_shutdown(); + return _eeze_init_count; +} + +EAPI int +eeze_shutdown(void) +{ + if (--_eeze_init_count != 0) + return _eeze_init_count; + + udev_unref(udev); + eina_log_domain_unregister(_eeze_log_dom); + _eeze_log_dom = -1; + eina_shutdown(); + return _eeze_init_count; +} diff --git a/legacy/eeze/src/lib/eeze_private.h b/legacy/eeze/src/lib/eeze_private.h new file mode 100644 index 0000000000..c1ef1940e1 --- /dev/null +++ b/legacy/eeze/src/lib/eeze_private.h @@ -0,0 +1,25 @@ +#ifndef EEZE_PRIVATE_H +#define EEZE_PRIVATE_H +#ifndef eeze_COLOR_DEFAULT +#define eeze_COLOR_DEFAULT EINA_COLOR_CYAN +#endif +extern int _eeze_log_dom; +#ifdef ERR +#undef ERR +#endif +#ifdef INF +#undef INF +#endif +#ifdef WARN +#undef WARN +#endif +#ifdef DBG +#undef DBG +#endif + +#define DBG(...) EINA_LOG_DOM_DBG(_eeze_log_dom, __VA_ARGS__) +#define INFO(...) EINA_LOG_DOM_INFO(_eeze_log_dom, __VA_ARGS__) +#define WARN(...) EINA_LOG_DOM_WARN(_eeze_log_dom, __VA_ARGS__) +#define ERR(...) EINA_LOG_DOM_ERR(_eeze_log_dom, __VA_ARGS__) + +#endif diff --git a/legacy/eeze/src/lib/udev/eeze_udev.c b/legacy/eeze/src/lib/eeze_udev.c similarity index 99% rename from legacy/eeze/src/lib/udev/eeze_udev.c rename to legacy/eeze/src/lib/eeze_udev.c index 7a18a13aee..b31d2b9b74 100644 --- a/legacy/eeze/src/lib/udev/eeze_udev.c +++ b/legacy/eeze/src/lib/eeze_udev.c @@ -2,7 +2,8 @@ #include "config.h" #endif -#include +#include +#include "eeze_private.h" #include "eeze_udev_private.h" extern _udev *udev; diff --git a/legacy/eeze/src/lib/udev/eeze_udev_find.c b/legacy/eeze/src/lib/eeze_udev_find.c similarity index 99% rename from legacy/eeze/src/lib/udev/eeze_udev_find.c rename to legacy/eeze/src/lib/eeze_udev_find.c index 9fbd4e4f9b..e2b4441bae 100644 --- a/legacy/eeze/src/lib/udev/eeze_udev_find.c +++ b/legacy/eeze/src/lib/eeze_udev_find.c @@ -2,8 +2,9 @@ #include "config.h" #endif +#include +#include "eeze_private.h" #include "eeze_udev_private.h" -#include extern _udev *udev; diff --git a/legacy/eeze/src/lib/udev/eeze_udev_private.c b/legacy/eeze/src/lib/eeze_udev_private.c similarity index 98% rename from legacy/eeze/src/lib/udev/eeze_udev_private.c rename to legacy/eeze/src/lib/eeze_udev_private.c index ffcb01af49..84ac33d7c0 100644 --- a/legacy/eeze/src/lib/udev/eeze_udev_private.c +++ b/legacy/eeze/src/lib/eeze_udev_private.c @@ -2,7 +2,8 @@ #include "config.h" #endif -#include +#include +#include "eeze_private.h" #include "eeze_udev_private.h" extern _udev *udev; diff --git a/legacy/eeze/src/lib/udev/eeze_udev_private.h b/legacy/eeze/src/lib/eeze_udev_private.h similarity index 51% rename from legacy/eeze/src/lib/udev/eeze_udev_private.h rename to legacy/eeze/src/lib/eeze_udev_private.h index 12515b9d55..57559c0ee1 100644 --- a/legacy/eeze/src/lib/udev/eeze_udev_private.h +++ b/legacy/eeze/src/lib/eeze_udev_private.h @@ -1,27 +1,6 @@ #ifndef EEZE_UDEV_PRIVATE_H #define EEZE_UDEV_PRIVATE_H -#include "Eeze_Udev.h" -#ifndef eeze_COLOR_DEFAULT -#define eeze_COLOR_DEFAULT EINA_COLOR_CYAN -#endif -extern int _eeze_udev_log_dom; -#ifdef ERR -#undef ERR -#endif -#ifdef INF -#undef INF -#endif -#ifdef WARN -#undef WARN -#endif -#ifdef DBG -#undef DBG -#endif - -#define DBG(...) EINA_LOG_DOM_DBG(_eeze_udev_log_dom, __VA_ARGS__) -#define INFO(...) EINA_LOG_DOM_INFO(_eeze_udev_log_dom, __VA_ARGS__) -#define WARN(...) EINA_LOG_DOM_WARN(_eeze_udev_log_dom, __VA_ARGS__) -#define ERR(...) EINA_LOG_DOM_ERR(_eeze_udev_log_dom, __VA_ARGS__) +#include "Eeze.h" typedef struct udev _udev; typedef struct udev_list_entry _udev_list_entry; diff --git a/legacy/eeze/src/lib/udev/eeze_udev_walk.c b/legacy/eeze/src/lib/eeze_udev_walk.c similarity index 98% rename from legacy/eeze/src/lib/udev/eeze_udev_walk.c rename to legacy/eeze/src/lib/eeze_udev_walk.c index e2b1710476..16a636212e 100644 --- a/legacy/eeze/src/lib/udev/eeze_udev_walk.c +++ b/legacy/eeze/src/lib/eeze_udev_walk.c @@ -2,7 +2,8 @@ #include "config.h" #endif -#include +#include +#include "eeze_private.h" #include "eeze_udev_private.h" extern _udev *udev; diff --git a/legacy/eeze/src/lib/udev/eeze_udev_watch.c b/legacy/eeze/src/lib/eeze_udev_watch.c similarity index 99% rename from legacy/eeze/src/lib/udev/eeze_udev_watch.c rename to legacy/eeze/src/lib/eeze_udev_watch.c index fbf5a5d8cd..4ce95812d6 100644 --- a/legacy/eeze/src/lib/udev/eeze_udev_watch.c +++ b/legacy/eeze/src/lib/eeze_udev_watch.c @@ -2,7 +2,8 @@ #include "config.h" #endif -#include +#include +#include "eeze_private.h" #include "eeze_udev_private.h" extern _udev *udev; diff --git a/legacy/eeze/src/lib/udev/Makefile.am b/legacy/eeze/src/lib/udev/Makefile.am deleted file mode 100644 index 20cb556d46..0000000000 --- a/legacy/eeze/src/lib/udev/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -AM_CPPFLAGS = @ECORE_CFLAGS@ - -if BUILD_EEZE_UDEV - -lib_LTLIBRARIES = libeeze_udev.la -include_HEADERS = Eeze_Udev.h - -noinst_HEADERS = eeze_udev_private.h - -libeeze_udev_la_SOURCES = \ -Eeze_Udev.h \ -eeze_udev.c \ -eeze_udev_watch.c \ -eeze_udev_main.c \ -eeze_udev_find.c \ -eeze_udev_walk.c \ -eeze_udev_private.c - -libeeze_udev_la_LIBADD = @ECORE_LIBS@ @UDEV_LIBS@ -libeeze_udev_la_LDFLAGS = -no-undefined -version-info @version_info@ @eeze_udev_release_info@ - -endif diff --git a/legacy/eeze/src/lib/udev/eeze_udev_main.c b/legacy/eeze/src/lib/udev/eeze_udev_main.c deleted file mode 100644 index c7d982feb1..0000000000 --- a/legacy/eeze/src/lib/udev/eeze_udev_main.c +++ /dev/null @@ -1,56 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include "eeze_udev_private.h" - -_udev *udev; - -int _eeze_udev_log_dom = -1; -int _eeze_udev_init_count = 0; - -EAPI int -eeze_udev_init(void) -{ - if (++_eeze_udev_init_count != 1) - return _eeze_udev_init_count; - - if (!eina_init()) - return --_eeze_udev_init_count; - - _eeze_udev_log_dom = eina_log_domain_register - ("eeze_udev", eeze_COLOR_DEFAULT); - - if (_eeze_udev_log_dom < 0) - { - EINA_LOG_ERR("Could not register 'eeze_udev' log domain."); - goto fail; - } - - if (!((udev) = udev_new())) - { - EINA_LOG_ERR("Could not initialize udev library!"); - goto fail; - } - - return _eeze_udev_init_count; -fail: - eina_log_domain_unregister(_eeze_udev_log_dom); - _eeze_udev_log_dom = -1; - eina_shutdown(); - return _eeze_udev_init_count; -} - -EAPI int -eeze_udev_shutdown(void) -{ - if (--_eeze_udev_init_count != 0) - return _eeze_udev_init_count; - - udev_unref(udev); - eina_log_domain_unregister(_eeze_udev_log_dom); - _eeze_udev_log_dom = -1; - eina_shutdown(); - return _eeze_udev_init_count; -}