On Thursday, December 6, 2012, Leandro Dorileo wrote:
> On Thu, Dec 06, 2012 at 05:38:36AM -0800, Enlightenment SVN wrote:
> > Log:
> > efl/ecore_file: refactor to be more like eio in providing backends.
> >
> > instead of the previous mess, just define the functions with common
> > names and call the backend that was compiled in, similar to what eio
> > does.
> >
> > also do not be silent on errors, use eina_safety_checks to issue
> warnings.
> >
> >
> >
> > Author: barbieri
> > Date: 2012-12-06 05:38:34 -0800 (Thu, 06 Dec 2012)
> > New Revision: 80360
> > Trac: http://trac.enlightenment.org/e/changeset/80360
> >
> > Modified:
> > trunk/efl/configure.ac trunk/efl/src/Makefile_Ecore_File.am
> trunk/efl/src/Makefile_Eio.am
> trunk/efl/src/lib/ecore_file/ecore_file_monitor.c
> trunk/efl/src/lib/ecore_file/ecore_file_monitor_inotify.c
> trunk/efl/src/lib/ecore_file/ecore_file_monitor_poll.c
> trunk/efl/src/lib/ecore_file/ecore_file_monitor_win32.c
> trunk/efl/src/lib/ecore_file/ecore_file_private.h
> >
> > Modified: trunk/efl/configure.ac
> > ===================================================================
> > --- trunk/efl/configure.ac 2012-12-06 13:24:27 UTC (rev 80359)
> > +++ trunk/efl/configure.ac 2012-12-06 13:38:34 UTC (rev 80360)
> > @@ -478,6 +478,13 @@
> > have_inotify="${ac_cv_header_sys_inotify_h}"
> > AM_CONDITIONAL([HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])
> >
> > +have_notify_win32="${have_win32}"
> > +AC_DEFINE_IF([HAVE_NOTIFY_WIN32],
> > + [test "x${have_notify_win32}" = "xyes"],
> > + [File monitoring with Windows notification])
>
> Missing val argument here... it should be:
>
> AC_DEFINE_IF([HAVE_NOTIFY_WIN32],
> [test "x${have_notify_win32}" = "xyes"], [1],
> [File monitoring with Windows notification])
Oops. Please commit a fix. I'm on the road
>
>
> > +AM_CONDITIONAL([HAVE_NOTIFY_WIN32], [test "x${have_notify_win32}" =
> "xyes"])
> > +
> > +
> > EFL_CHECK_PATH_MAX
> >
> >
> > @@ -2392,17 +2399,6 @@
> > have_poll="yes"
> > fi
> >
> > -have_notify_win32="no"
> > -
> > -case "$host_os" in
> > - mingw32ce*)
> > - ;;
> > - mingw32*)
> > - have_notify_win32="yes"
> > - AC_DEFINE([HAVE_NOTIFY_WIN32], [1], [File monitoring with Windows
> notification])
> > - ;;
> > -esac
> > -
> > if ! test "x${have_atfile_source}" = "xno" ; then
> > AC_CHECK_FUNCS([mkdirat],
> > [
> > @@ -3933,11 +3929,6 @@
> >
> > AC_MSG_RESULT([${have_xattr}])
> >
> > -# Check for inotify specificity
> > -have_notify_win32="no"
> > -EIO_CHECK_NOTIFY_WIN32([have_notify_win32="yes"],
> [have_notify_win32="no"])
> > -AM_CONDITIONAL([EIO_HAVE_WINCHANGE], [test "x${have_notify_win32}" =
> "xyes"])
> > -
> > #### End of Eio
> >
> >
> >
> > Modified: trunk/efl/src/Makefile_Ecore_File.am
> > ===================================================================
> > --- trunk/efl/src/Makefile_Ecore_File.am 2012-12-06 13:24:27 UTC
> (rev 80359)
> > +++ trunk/efl/src/Makefile_Ecore_File.am 2012-12-06 13:38:34 UTC
> (rev 80360)
> > @@ -11,12 +11,22 @@
> > lib/ecore_file/ecore_file.c \
> > lib/ecore_file/ecore_file_download.c \
> > lib/ecore_file/ecore_file_monitor.c \
> > -lib/ecore_file/ecore_file_monitor_inotify.c \
> > -lib/ecore_file/ecore_file_monitor_poll.c \
> > -lib/ecore_file/ecore_file_monitor_win32.c \
> > lib/ecore_file/ecore_file_path.c \
> > lib/ecore_file/ecore_file_private.h
> >
> > +if HAVE_INOTIFY
> > +lib_ecore_file_libecore_file_la_SOURCES += \
> > +lib/ecore_file/ecore_file_monitor_inotify.c
> > +else
> > +if HAVE_NOTIFY_WIN32
> > +lib_ecore_file_libecore_file_la_SOURCES += \
> > +lib/ecore_file/ecore_file_monitor_win32.c
> > +else
> > +lib_ecore_file_libecore_file_la_SOURCES += \
> > +lib/ecore_file/ecore_file_monitor_poll.c
> > +endif
> > +endif
> > +
> > lib_ecore_file_libecore_file_la_CPPFLAGS = \
> > -I$(top_srcdir)/src/lib/eina \
> > -I$(top_srcdir)/src/lib/eo \
> >
> > Modified: trunk/efl/src/Makefile_Eio.am
> > ===================================================================
> > --- trunk/efl/src/Makefile_Eio.am 2012-12-06 13:24:27 UTC (rev 80359)
> > +++ trunk/efl/src/Makefile_Eio.am 2012-12-06 13:38:34 UTC (rev 80360)
> > @@ -21,7 +21,7 @@
> > if HAVE_INOTIFY
> > lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_inotify.c
> > else
> > -if EIO_HAVE_WINCHANGE
> > +if HAVE_NOTIFY_WIN32
> > lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_win32.c
> > endif
> > endif
> >
> > Modified: trunk/efl/src/lib/ecore_file/ecore_file_monitor.c
> > ===================================================================
> > --- trunk/efl/src/lib/ecore_file/ecore_file_monitor.c 2012-12-06
> 13:24:27 UTC (rev 80359)
> > +++ trunk/efl/src/lib/ecore_file/ecore_file_monitor.c 2012-12-06
> 13:38:34 UTC (rev 80360)
> > @@ -4,66 +4,18 @@
> >
> > #include "ecore_file_private.h"
> >
> > -typedef enum {
> > - ECORE_FILE_MONITOR_TYPE_NONE,
> > -#ifdef HAVE_SYS_INOTIFY_H
> > - ECORE_FILE_MONITOR_TYPE_INOTIFY,
> > -#endif
> > -#ifdef HAVE_NOTIFY_WIN32
> > - ECORE_FILE_MONITOR_TYPE_NOTIFY_WIN32,
> > -#endif
> > -#ifdef HAVE_POLL
> > - ECORE_FILE_MONITOR_TYPE_POLL
> > -#endif
> > -} Ecore_File_Monitor_Type;
> > -
> > -static Ecore_File_Monitor_Type monitor_type =
> ECORE_FILE_MONITOR_TYPE_NONE;
> > -
> > int
> > ecore_file_monitor_init(void)
> > {
> > -#ifdef HAVE_SYS_INOTIFY_H
> > - monitor_type = ECORE_FILE_MONITOR_TYPE_INOTIFY;
> > - if (ecore_file_monitor_inot--
> Leandro Dorileo
> ProFUSION embedded systems
> http://profusion.mobi
>
>
> ------------------------------------------------------------------------------
> LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
> Remotely access PCs and mobile devices and provide instant support
> Improve your efficiency, and focus on delivering more value-add services
> Discover what IT Professionals Know. Rescue delivers
> http://p.sf.net/sfu/logmein_12329d2d
> _______________________________________________
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net <javascript:;>
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
Gustavo Sverzut Barbieri
http://profusion.mobi embedded systems
--------------------------------------
MSN: barbi...@gmail.com
Skype: gsbarbieri
Mobile: +55 (19) 9225-2202
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
