From 66718af2b913632aafcf3bb9c7341f62d305b38d Mon Sep 17 00:00:00 2001 From: Kai Huuhko Date: Mon, 15 Aug 2016 08:49:42 +0300 Subject: [PATCH] WIP --- efl/ecore_con/efl.ecore_con.pyx | 34 ++++++- efl/ecore_input/efl.ecore_input.pyx | 23 ++--- efl/ecore_input/efl.ecore_input_events.pxi | 97 +++++++++++-------- include/efl.ecore_con.enums.pxd | 28 ++++++ {efl/ecore_con => include}/efl.ecore_con.pxd | 38 +------- include/efl.ecore_input.enums.pxd | 17 ++++ .../efl.ecore_input.pxd | 19 ---- {efl/ecore_x => include}/efl.ecore_x.pxd | 0 setup.py | 86 ++++++++-------- 9 files changed, 189 insertions(+), 153 deletions(-) create mode 100644 include/efl.ecore_con.enums.pxd rename {efl/ecore_con => include}/efl.ecore_con.pxd (86%) create mode 100644 include/efl.ecore_input.enums.pxd rename {efl/ecore_input => include}/efl.ecore_input.pxd (91%) rename {efl/ecore_x => include}/efl.ecore_x.pxd (100%) diff --git a/efl/ecore_con/efl.ecore_con.pyx b/efl/ecore_con/efl.ecore_con.pyx index d7e9fcb..2c1f08e 100644 --- a/efl/ecore_con/efl.ecore_con.pyx +++ b/efl/ecore_con/efl.ecore_con.pyx @@ -127,7 +127,7 @@ that headers such as "If-Modified-Since" are used. .. data:: ECORE_CON_URL_TIME_NONE - Do not place time restrictions on the HTTP requests. + Do not place time restrictions on the HTTP requests. .. data:: ECORE_CON_URL_TIME_IFMODSINCE @@ -173,6 +173,32 @@ import atexit from efl.ecore cimport _event_mapping_register, _event_mapping_get, \ ecore_event_handler_add, ecore_event_handler_del +import efl.ecore_con.enums as enums + +ECORE_CON_LOCAL_USER = enums.ECORE_CON_LOCAL_USER +ECORE_CON_LOCAL_SYSTEM = enums.ECORE_CON_LOCAL_SYSTEM +ECORE_CON_LOCAL_ABSTRACT = enums.ECORE_CON_LOCAL_ABSTRACT +ECORE_CON_REMOTE_TCP = enums.ECORE_CON_REMOTE_TCP +ECORE_CON_REMOTE_MCAST = enums.ECORE_CON_REMOTE_MCAST +ECORE_CON_REMOTE_UDP = enums.ECORE_CON_REMOTE_UDP +ECORE_CON_REMOTE_BROADCAST = enums.ECORE_CON_REMOTE_BROADCAST +ECORE_CON_REMOTE_NODELAY = enums.ECORE_CON_REMOTE_NODELAY +ECORE_CON_REMOTE_CORK = enums.ECORE_CON_REMOTE_CORK +ECORE_CON_USE_SSL2 = enums.ECORE_CON_USE_SSL2 +ECORE_CON_USE_SSL3 = enums.ECORE_CON_USE_SSL3 +ECORE_CON_USE_TLS = enums.ECORE_CON_USE_TLS +ECORE_CON_USE_MIXED = enums.ECORE_CON_USE_MIXED +ECORE_CON_LOAD_CERT = enums.ECORE_CON_LOAD_CERT +ECORE_CON_NO_PROXY = enums.ECORE_CON_NO_PROXY +ECORE_CON_SOCKET_ACTIVATE = enums.ECORE_CON_SOCKET_ACTIVATE + +ECORE_CON_URL_TIME_NONE = enums.ECORE_CON_URL_TIME_NONE +ECORE_CON_URL_TIME_IFMODSINCE = enums.ECORE_CON_URL_TIME_IFMODSINCE +ECORE_CON_URL_TIME_IFUNMODSINCE = enums.ECORE_CON_URL_TIME_IFUNMODSINCE + +ECORE_CON_URL_HTTP_VERSION_1_0 = enums.ECORE_CON_URL_HTTP_VERSION_1_0 +ECORE_CON_URL_HTTP_VERSION_1_1 = enums.ECORE_CON_URL_HTTP_VERSION_1_1 + cdef int _con_events_registered = 0 @@ -193,9 +219,9 @@ def init(): global _con_events_registered if _con_events_registered == 0: - _event_mapping_register(ECORE_CON_EVENT_URL_COMPLETE, EventUrlComplete) - _event_mapping_register(ECORE_CON_EVENT_URL_PROGRESS, EventUrlProgress) - _event_mapping_register(ECORE_CON_EVENT_URL_DATA, EventUrlData) + _event_mapping_register(enums.ECORE_CON_EVENT_URL_COMPLETE, EventUrlComplete) + _event_mapping_register(enums.ECORE_CON_EVENT_URL_PROGRESS, EventUrlProgress) + _event_mapping_register(enums.ECORE_CON_EVENT_URL_DATA, EventUrlData) _con_events_registered = 1 diff --git a/efl/ecore_input/efl.ecore_input.pyx b/efl/ecore_input/efl.ecore_input.pyx index 3cc951f..524b76b 100644 --- a/efl/ecore_input/efl.ecore_input.pyx +++ b/efl/ecore_input/efl.ecore_input.pyx @@ -55,27 +55,27 @@ Ecore_Event_Modifier .. data:: ECORE_EVENT_MODIFIER_SHIFT -.. data:: ECORE_EVENT_MODIFIER_CTRL +.. data:: ECORE_EVENT_MODIFIER_CTRL -.. data:: ECORE_EVENT_MODIFIER_ALT +.. data:: ECORE_EVENT_MODIFIER_ALT -.. data:: ECORE_EVENT_MODIFIER_WIN +.. data:: ECORE_EVENT_MODIFIER_WIN -.. data:: ECORE_EVENT_MODIFIER_SCROLL +.. data:: ECORE_EVENT_MODIFIER_SCROLL -.. data:: ECORE_EVENT_MODIFIER_NUM +.. data:: ECORE_EVENT_MODIFIER_NUM -.. data:: ECORE_EVENT_MODIFIER_CAPS +.. data:: ECORE_EVENT_MODIFIER_CAPS -.. data:: ECORE_EVENT_LOCK_SCROLL +.. data:: ECORE_EVENT_LOCK_SCROLL -.. data:: ECORE_EVENT_LOCK_NUM +.. data:: ECORE_EVENT_LOCK_NUM -.. data:: ECORE_EVENT_LOCK_CAPS +.. data:: ECORE_EVENT_LOCK_CAPS -.. data:: ECORE_EVENT_LOCK_SHIFT +.. data:: ECORE_EVENT_LOCK_SHIFT -.. data:: ECORE_EVENT_MODIFIER_ALTGR +.. data:: ECORE_EVENT_MODIFIER_ALTGR Classes and Functions @@ -87,6 +87,7 @@ Classes and Functions import atexit import traceback +cimport efl.ecore_input.enums as enums def init(): """ Initialize the Ecore Input library diff --git a/efl/ecore_input/efl.ecore_input_events.pxi b/efl/ecore_input/efl.ecore_input_events.pxi index 3e71fdb..c449491 100644 --- a/efl/ecore_input/efl.ecore_input_events.pxi +++ b/efl/ecore_input/efl.ecore_input_events.pxi @@ -20,20 +20,35 @@ from efl.utils.conversions cimport _ctouni from efl.ecore cimport _event_mapping_register, _event_mapping_get +ECORE_EVENT_MODIFIER_SHIFT = enums.ECORE_EVENT_MODIFIER_SHIFT +ECORE_EVENT_MODIFIER_CTRL = enums.ECORE_EVENT_MODIFIER_CTRL +ECORE_EVENT_MODIFIER_ALT = enums.ECORE_EVENT_MODIFIER_ALT +ECORE_EVENT_MODIFIER_WIN = enums.ECORE_EVENT_MODIFIER_WIN +ECORE_EVENT_MODIFIER_SCROLL = enums.ECORE_EVENT_MODIFIER_SCROLL +ECORE_EVENT_MODIFIER_NUM = enums.ECORE_EVENT_MODIFIER_NUM +ECORE_EVENT_MODIFIER_CAPS = enums.ECORE_EVENT_MODIFIER_CAPS +ECORE_EVENT_LOCK_SCROLL = enums.ECORE_EVENT_LOCK_SCROLL +ECORE_EVENT_LOCK_NUM = enums.ECORE_EVENT_LOCK_NUM +ECORE_EVENT_LOCK_CAPS = enums.ECORE_EVENT_LOCK_CAPS +ECORE_EVENT_LOCK_SHIFT = enums.ECORE_EVENT_LOCK_SHIFT +ECORE_EVENT_MODIFIER_ALTGR = enums.ECORE_EVENT_MODIFIER_ALTGR + + + cdef int _input_events_registered = 0 cdef int _ecore_input_events_register() except 0: global _input_events_registered if _input_events_registered == 0: - _event_mapping_register(ECORE_EVENT_KEY_DOWN, EventKey) - _event_mapping_register(ECORE_EVENT_KEY_UP, EventKey) - _event_mapping_register(ECORE_EVENT_MOUSE_BUTTON_DOWN, EventMouseButton) - _event_mapping_register(ECORE_EVENT_MOUSE_BUTTON_UP, EventMouseButton) - _event_mapping_register(ECORE_EVENT_MOUSE_MOVE, EventMouseMove) - _event_mapping_register(ECORE_EVENT_MOUSE_IN, EventMouseIO) - _event_mapping_register(ECORE_EVENT_MOUSE_OUT, EventMouseIO) - _event_mapping_register(ECORE_EVENT_MOUSE_WHEEL, EventMouseWheel) + _event_mapping_register(enums.ECORE_EVENT_KEY_DOWN, EventKey) + _event_mapping_register(enums.ECORE_EVENT_KEY_UP, EventKey) + _event_mapping_register(enums.ECORE_EVENT_MOUSE_BUTTON_DOWN, EventMouseButton) + _event_mapping_register(enums.ECORE_EVENT_MOUSE_BUTTON_UP, EventMouseButton) + _event_mapping_register(enums.ECORE_EVENT_MOUSE_MOVE, EventMouseMove) + _event_mapping_register(enums.ECORE_EVENT_MOUSE_IN, EventMouseIO) + _event_mapping_register(enums.ECORE_EVENT_MOUSE_OUT, EventMouseIO) + _event_mapping_register(enums.ECORE_EVENT_MOUSE_WHEEL, EventMouseWheel) _input_events_registered = 1 @@ -93,7 +108,7 @@ cdef class EventKey(Event): :ivar str keyname: The key name :ivar str key: The key symbol :ivar str string: - :ivar int compose: Final string corresponding to the key symbol composed + :ivar int compose: Final string corresponding to the key symbol composed :ivar int timestamp: Time when the event occurred. :ivar int modifiers: :ref:`Ecore_Event_Modifier` The OR combination of modifiers key :ivar bool same_screen: Same screen flag @@ -132,16 +147,16 @@ cdef class EventPoint: cdef class EventMulti: """ - :ivar int device: 0 if normal mouse, 1+ for other mouse-devices (eg multi-touch - other fingers) - :ivar double radius: radius of press point - radius_x and y if its an ellipse (radius is the average of the 2) - :ivar double radius_x: - :ivar double radius_y: - :ivar double pressure: 1.0 == normal, > 1.0 == more, 0.0 == none - :ivar double angle: relative to perpendicular (0.0 == perpendicular), in degrees - :ivar double x: with sub-pixel precision, if available - :ivar double y: with sub-pixel precision, if available - :ivar double root_x: with sub-pixel precision, if available - :ivar double root_y: with sub-pixel precision, if available + :ivar int device: 0 if normal mouse, 1+ for other mouse-devices (eg multi-touch - other fingers) + :ivar double radius: radius of press point - radius_x and y if its an ellipse (radius is the average of the 2) + :ivar double radius_x: + :ivar double radius_y: + :ivar double pressure: 1.0 == normal, > 1.0 == more, 0.0 == none + :ivar double angle: relative to perpendicular (0.0 == perpendicular), in degrees + :ivar double x: with sub-pixel precision, if available + :ivar double y: with sub-pixel precision, if available + :ivar double root_x: with sub-pixel precision, if available + :ivar double root_y: with sub-pixel precision, if available """ def __init__(self, int device, double radius, double radius_x, double radius_y, double pressure, double angle, double x, double y, @@ -173,9 +188,9 @@ cdef class EventMouseButton(Event): :ivar int buttons: The button that was used :ivar bool double_click: Double click event :ivar bool triple_click: Triple click event - :ivar bool same_screen: Same screen flag - :ivar int x: x coordinate relative to window where event happened - :ivar int y: y coordinate relative to window where event happened + :ivar bool same_screen: Same screen flag + :ivar int x: x coordinate relative to window where event happened + :ivar int y: y coordinate relative to window where event happened :ivar EventPoint root: :class:`EventPoint` Coordinates relative to root window """ @@ -211,9 +226,9 @@ cdef class EventMouseMove(Event): :ivar int timestamp: Time when the event occurred :ivar int modifiers: :ref:`Ecore_Event_Modifier` The OR combination of modifiers key - :ivar bool same_screen: Same screen flag - :ivar int x: x coordinate relative to window where event happened - :ivar int y: y coordinate relative to window where event happened + :ivar bool same_screen: Same screen flag + :ivar int x: x coordinate relative to window where event happened + :ivar int y: y coordinate relative to window where event happened :ivar EventPoint root: Coordinates relative to root window """ @@ -246,8 +261,8 @@ cdef class EventMouseIO(Event): :ivar int timestamp: Time when the event occurred :ivar int modifiers: :ref:`Ecore_Event_Modifier` The OR combination of modifiers key - :ivar int x: x coordinate relative to window where event happened - :ivar int y: y coordinate relative to window where event happened + :ivar int x: x coordinate relative to window where event happened + :ivar int y: y coordinate relative to window where event happened """ cdef int _set_obj(self, void *o) except 0: @@ -271,12 +286,12 @@ cdef class EventMouseWheel(Event): :ivar int timestamp: Time when the event occurred :ivar int modifiers: :ref:`Ecore_Event_Modifier` The OR combination of modifiers key - :ivar bool same_screen: Same screen flag - :ivar int direction: Orientation of the wheel (horizontal/vertical) - :ivar int z: Value of the wheel event (+1/-1) - :ivar int x: x coordinate relative to window where event happened - :ivar int y: y coordinate relative to window where event happened - :ivar EventPoint root: Coordinates relative to root window. + :ivar bool same_screen: Same screen flag + :ivar int direction: Orientation of the wheel (horizontal/vertical) + :ivar int z: Value of the wheel event (+1/-1) + :ivar int x: x coordinate relative to window where event happened + :ivar int y: y coordinate relative to window where event happened + :ivar EventPoint root: Coordinates relative to root window. """ cdef int _set_obj(self, void *o) except 0: @@ -304,7 +319,7 @@ def on_key_down_add(func, *args, **kargs): .. seealso:: :class:`EventKey` """ - return InputEventHandler(ECORE_EVENT_KEY_DOWN, func, *args, **kargs) + return InputEventHandler(enums.ECORE_EVENT_KEY_DOWN, func, *args, **kargs) def on_key_up_add(func, *args, **kargs): """ @@ -314,7 +329,7 @@ def on_key_up_add(func, *args, **kargs): .. seealso:: :class:`EventKey` """ - return InputEventHandler(ECORE_EVENT_KEY_UP, func, *args, **kargs) + return InputEventHandler(enums.ECORE_EVENT_KEY_UP, func, *args, **kargs) def on_mouse_button_down_add(func, *args, **kargs): """ @@ -324,7 +339,7 @@ def on_mouse_button_down_add(func, *args, **kargs): .. seealso:: :class:`EventMouseButton` """ - return InputEventHandler(ECORE_EVENT_MOUSE_BUTTON_DOWN, func, *args, **kargs) + return InputEventHandler(enums.ECORE_EVENT_MOUSE_BUTTON_DOWN, func, *args, **kargs) def on_mouse_button_up_add(func, *args, **kargs): """ @@ -334,7 +349,7 @@ def on_mouse_button_up_add(func, *args, **kargs): .. seealso:: :class:`EventMouseButton` """ - return InputEventHandler(ECORE_EVENT_MOUSE_BUTTON_UP, func, *args, **kargs) + return InputEventHandler(enums.ECORE_EVENT_MOUSE_BUTTON_UP, func, *args, **kargs) def on_mouse_move_add(func, *args, **kargs): """ @@ -344,7 +359,7 @@ def on_mouse_move_add(func, *args, **kargs): .. seealso:: :class:`EventMouseMove` """ - return InputEventHandler(ECORE_EVENT_MOUSE_MOVE, func, *args, **kargs) + return InputEventHandler(enums.ECORE_EVENT_MOUSE_MOVE, func, *args, **kargs) def on_mouse_in_add(func, *args, **kargs): """ @@ -354,7 +369,7 @@ def on_mouse_in_add(func, *args, **kargs): .. seealso:: :class:`EventMouseIO` """ - return InputEventHandler(ECORE_EVENT_MOUSE_IN, func, *args, **kargs) + return InputEventHandler(enums.ECORE_EVENT_MOUSE_IN, func, *args, **kargs) def on_mouse_out_add(func, *args, **kargs): """ @@ -364,7 +379,7 @@ def on_mouse_out_add(func, *args, **kargs): .. seealso:: :class:`EventMouseIO` """ - return InputEventHandler(ECORE_EVENT_MOUSE_OUT, func, *args, **kargs) + return InputEventHandler(enums.ECORE_EVENT_MOUSE_OUT, func, *args, **kargs) def on_mouse_wheel_add(func, *args, **kargs): """ @@ -374,4 +389,4 @@ def on_mouse_wheel_add(func, *args, **kargs): .. seealso:: :class:`EventMouseWheel` """ - return InputEventHandler(ECORE_EVENT_MOUSE_WHEEL, func, *args, **kargs) + return InputEventHandler(enums.ECORE_EVENT_MOUSE_WHEEL, func, *args, **kargs) diff --git a/include/efl.ecore_con.enums.pxd b/include/efl.ecore_con.enums.pxd new file mode 100644 index 0000000..5b5ac7d --- /dev/null +++ b/include/efl.ecore_con.enums.pxd @@ -0,0 +1,28 @@ +cdef extern from "Ecore_Con.h": + # enums + ctypedef enum Ecore_Con_Type: + ECORE_CON_LOCAL_USER + ECORE_CON_LOCAL_SYSTEM + ECORE_CON_LOCAL_ABSTRACT + ECORE_CON_REMOTE_TCP + ECORE_CON_REMOTE_MCAST + ECORE_CON_REMOTE_UDP + ECORE_CON_REMOTE_BROADCAST + ECORE_CON_REMOTE_NODELAY + ECORE_CON_REMOTE_CORK + ECORE_CON_USE_SSL2 + ECORE_CON_USE_SSL3 + ECORE_CON_USE_TLS + ECORE_CON_USE_MIXED + ECORE_CON_LOAD_CERT + ECORE_CON_NO_PROXY + ECORE_CON_SOCKET_ACTIVATE + + ctypedef enum Ecore_Con_Url_Time: + ECORE_CON_URL_TIME_NONE + ECORE_CON_URL_TIME_IFMODSINCE + ECORE_CON_URL_TIME_IFUNMODSINCE + + ctypedef enum Ecore_Con_Url_Http_Version: + ECORE_CON_URL_HTTP_VERSION_1_0 + ECORE_CON_URL_HTTP_VERSION_1_1 diff --git a/efl/ecore_con/efl.ecore_con.pxd b/include/efl.ecore_con.pxd similarity index 86% rename from efl/ecore_con/efl.ecore_con.pxd rename to include/efl.ecore_con.pxd index 71a089e..3617c6d 100644 --- a/efl/ecore_con/efl.ecore_con.pxd +++ b/include/efl.ecore_con.pxd @@ -22,7 +22,8 @@ from efl.eo cimport Eo, object_from_instance from efl.ecore cimport Ecore_Event_Handler, Event from efl.utils.conversions cimport _ctouni, eina_list_strings_to_python_list - +from efl.ecore_con.enums cimport Ecore_Con_Type, Ecore_Con_Url_Time, \ + Ecore_Con_Url_Http_Version cdef extern from "Ecore_Con.h": @@ -59,39 +60,6 @@ cdef extern from "Ecore_Con.h": ctypedef void (*Ecore_Con_Dns_Cb)(const char *canonname, const char *ip, sockaddr *addr, int addrlen, void *data) - # enums - cpdef enum Ecore_Con_Type: - ECORE_CON_LOCAL_USER - ECORE_CON_LOCAL_SYSTEM - ECORE_CON_LOCAL_ABSTRACT - ECORE_CON_REMOTE_TCP - ECORE_CON_REMOTE_MCAST - ECORE_CON_REMOTE_UDP - ECORE_CON_REMOTE_BROADCAST - ECORE_CON_REMOTE_NODELAY - ECORE_CON_REMOTE_CORK - ECORE_CON_USE_SSL2 - ECORE_CON_USE_SSL3 - ECORE_CON_USE_TLS - ECORE_CON_USE_MIXED - ECORE_CON_LOAD_CERT - ECORE_CON_NO_PROXY - ECORE_CON_SOCKET_ACTIVATE - ctypedef enum Ecore_Con_Type: - pass - - cpdef enum Ecore_Con_Url_Time: - ECORE_CON_URL_TIME_NONE - ECORE_CON_URL_TIME_IFMODSINCE - ECORE_CON_URL_TIME_IFUNMODSINCE - ctypedef enum Ecore_Con_Url_Time: - pass - - cpdef enum Ecore_Con_Url_Http_Version: - ECORE_CON_URL_HTTP_VERSION_1_0 - ECORE_CON_URL_HTTP_VERSION_1_1 - ctypedef enum Ecore_Con_Url_Http_Version: - pass # functions int ecore_con_init() @@ -103,7 +71,7 @@ cdef extern from "Ecore_Con.h": void ecore_con_url_pipeline_set(Eina_Bool enable) Eina_Bool ecore_con_url_pipeline_get() Eina_Bool ecore_con_lookup(const char *name, Ecore_Con_Dns_Cb done_cb, const void *data) - + Ecore_Con_Url *ecore_con_url_new(const char *url) void ecore_con_url_free(Ecore_Con_Url *url_obj) Ecore_Con_Url * ecore_con_url_custom_new(const char *url, const char *custom_request) diff --git a/include/efl.ecore_input.enums.pxd b/include/efl.ecore_input.enums.pxd new file mode 100644 index 0000000..78f8b24 --- /dev/null +++ b/include/efl.ecore_input.enums.pxd @@ -0,0 +1,17 @@ +cdef extern from "Ecore_Input.h": + #################################################################### + # Enums + # + ctypedef enum Ecore_Event_Modifier: # this is not really an enum + ECORE_EVENT_MODIFIER_SHIFT + ECORE_EVENT_MODIFIER_CTRL + ECORE_EVENT_MODIFIER_ALT + ECORE_EVENT_MODIFIER_WIN + ECORE_EVENT_MODIFIER_SCROLL + ECORE_EVENT_MODIFIER_NUM + ECORE_EVENT_MODIFIER_CAPS + ECORE_EVENT_LOCK_SCROLL + ECORE_EVENT_LOCK_NUM + ECORE_EVENT_LOCK_CAPS + ECORE_EVENT_LOCK_SHIFT + ECORE_EVENT_MODIFIER_ALTGR diff --git a/efl/ecore_input/efl.ecore_input.pxd b/include/efl.ecore_input.pxd similarity index 91% rename from efl/ecore_input/efl.ecore_input.pxd rename to include/efl.ecore_input.pxd index 9d46848..ea6d3c5 100644 --- a/efl/ecore_input/efl.ecore_input.pxd +++ b/include/efl.ecore_input.pxd @@ -22,25 +22,6 @@ from efl.ecore cimport Ecore_Event_Handler, ecore_event_handler_add, \ cdef extern from "Ecore_Input.h": - #################################################################### - # Enums - # - cpdef enum Ecore_Event_Modifier: # this is not really an enum - ECORE_EVENT_MODIFIER_SHIFT - ECORE_EVENT_MODIFIER_CTRL - ECORE_EVENT_MODIFIER_ALT - ECORE_EVENT_MODIFIER_WIN - ECORE_EVENT_MODIFIER_SCROLL - ECORE_EVENT_MODIFIER_NUM - ECORE_EVENT_MODIFIER_CAPS - ECORE_EVENT_LOCK_SCROLL - ECORE_EVENT_LOCK_NUM - ECORE_EVENT_LOCK_CAPS - ECORE_EVENT_LOCK_SHIFT - ECORE_EVENT_MODIFIER_ALTGR - ctypedef enum Ecore_Event_Modifier: - pass - #################################################################### # events (not exposed to python) # diff --git a/efl/ecore_x/efl.ecore_x.pxd b/include/efl.ecore_x.pxd similarity index 100% rename from efl/ecore_x/efl.ecore_x.pxd rename to include/efl.ecore_x.pxd diff --git a/setup.py b/setup.py index d553e72..d3fd16d 100755 --- a/setup.py +++ b/setup.py @@ -316,51 +316,51 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv): eina_libs + evas_libs) ext_modules.append(ecore_ext) - # # === Ecore Input === - # ecore_input_cflags, ecore_input_libs = pkg_config('EcoreInput', - # 'ecore-input', - # EFL_MIN_VER) - # ecore_input_ext = Extension("ecore_input", - # ["efl/ecore_input/efl.ecore_input" + module_suffix], - # include_dirs=['include/'], - # extra_compile_args=list(set(ecore_cflags + - # ecore_file_cflags + - # ecore_input_cflags)), - # extra_link_args=ecore_libs + ecore_file_libs + - # ecore_input_libs) - # ext_modules.append(ecore_input_ext) + # === Ecore Input === + ecore_input_cflags, ecore_input_libs = pkg_config('EcoreInput', + 'ecore-input', + EFL_MIN_VER) + ecore_input_ext = Extension("ecore_input", + ["efl/ecore_input/efl.ecore_input" + module_suffix], + include_dirs=['include/'], + extra_compile_args=list(set(ecore_cflags + + ecore_file_cflags + + ecore_input_cflags)), + extra_link_args=ecore_libs + ecore_file_libs + + ecore_input_libs) + ext_modules.append(ecore_input_ext) - # # === Ecore Con === - # ecore_con_cflags, ecore_con_libs = pkg_config('EcoreCon', 'ecore-con', - # EFL_MIN_VER) - # ecore_con_ext = Extension("ecore_con", - # ["efl/ecore_con/efl.ecore_con" + module_suffix], - # include_dirs=['include/'], - # extra_compile_args=list(set(ecore_cflags + - # ecore_file_cflags + - # ecore_con_cflags)), - # extra_link_args=ecore_libs + ecore_file_libs + - # ecore_con_libs + eina_libs) - # ext_modules.append(ecore_con_ext) + # === Ecore Con === + ecore_con_cflags, ecore_con_libs = pkg_config('EcoreCon', 'ecore-con', + EFL_MIN_VER) + ecore_con_ext = Extension("ecore_con", + ["efl/ecore_con/efl.ecore_con" + module_suffix], + include_dirs=['include/'], + extra_compile_args=list(set(ecore_cflags + + ecore_file_cflags + + ecore_con_cflags)), + extra_link_args=ecore_libs + ecore_file_libs + + ecore_con_libs + eina_libs) + ext_modules.append(ecore_con_ext) - # # === Ecore X === - # try: - # ecore_x_cflags, ecore_x_libs = pkg_config('EcoreX', 'ecore-x', - # EFL_MIN_VER) - # except SystemExit: - # print("Not found, will not be built") - # else: - # ecore_x_ext = Extension("ecore_x", - # ["efl/ecore_x/efl.ecore_x" + module_suffix], - # include_dirs=['include/'], - # extra_compile_args=list(set(ecore_cflags + - # ecore_file_cflags + - # ecore_x_cflags + - # ecore_input_cflags)), - # extra_link_args=ecore_libs + ecore_file_libs + - # ecore_x_libs + ecore_input_libs + - # eina_libs + evas_libs) - # ext_modules.append(ecore_x_ext) + # === Ecore X === + try: + ecore_x_cflags, ecore_x_libs = pkg_config('EcoreX', 'ecore-x', + EFL_MIN_VER) + except SystemExit: + print("Not found, will not be built") + else: + ecore_x_ext = Extension("ecore_x", + ["efl/ecore_x/efl.ecore_x" + module_suffix], + include_dirs=['include/'], + extra_compile_args=list(set(ecore_cflags + + ecore_file_cflags + + ecore_x_cflags + + ecore_input_cflags)), + extra_link_args=ecore_libs + ecore_file_libs + + ecore_x_libs + ecore_input_libs + + eina_libs + evas_libs) + ext_modules.append(ecore_x_ext) # # === Ethumb === # ethumb_cflags, ethumb_libs = pkg_config('Ethumb', 'ethumb', EFL_MIN_VER)