Revert "disable to build floating build for temporary"

This reverts commit bc0c1c8e1ea5690e08b544b0a12cabf8a6f2f934.

Change-Id: I89162d9f020f98910634c8ee4a8fbfb9fbc09bbb
Signed-off-by: Sungtaek Hong <sth253.hong@samsung.com>

diff --git a/inc/CMakeLists.txt b/inc/CMakeLists.txt
index 965a799cc47fa2cee69ec6c9051adbbb46acf58e..234ceb49c5cef8d8e6c4216515d341407b0e5567 100644 (file)
--- a/inc/CMakeLists.txt
+++ b/inc/CMakeLists.txt
@@ -37,9 +37,9 @@ SET(LIB_INCS
        ${LIB_INCS}
        mobile/eext_floatingbutton_common.h
        mobile/eext_floatingbutton_legacy.h
-#      mobile/eext_floatingbutton.eo.legacy.h
-#      mobile/eext_floatingbutton_eo.h
-#      mobile/eext_floatingbutton.eo.h
+       mobile/eext_floatingbutton.eo.legacy.h
+       mobile/eext_floatingbutton_eo.h
+       mobile/eext_floatingbutton.eo.h
        efl_extension.h
 )
 

diff --git a/inc/mobile/eext_floatingbutton.h b/inc/mobile/eext_floatingbutton.h
index be7dd5ec8aedfe161f8a70a34fa0c62273aebcff..13b9f0adceda6f20aad428a0caaf0cd4c47f688e 100644 (file)
--- a/inc/mobile/eext_floatingbutton.h
+++ b/inc/mobile/eext_floatingbutton.h
@@ -42,12 +42,12 @@
  * @{
  */
 #include "eext_floatingbutton_common.h"
-//#ifdef EFL_EO_API_SUPPORT
-//#include "eext_floatingbutton_eo.h"
-//#endif
-//#ifndef EFL_NOLEGACY_API_SUPPORT
+#ifdef EFL_EO_API_SUPPORT
+#include "eext_floatingbutton_eo.h"
+#endif
+#ifndef EFL_NOLEGACY_API_SUPPORT
 #include "eext_floatingbutton_legacy.h"
-//#endif
+#endif
 /**
  * @}
  */

diff --git a/inc/mobile/eext_floatingbutton_legacy.h b/inc/mobile/eext_floatingbutton_legacy.h
index 7e679cf9a1d205beca42ef5dc45bf659d4406567..9e9c77c719e4acc972d77faf3e6a4171bccdc484 100644 (file)
--- a/inc/mobile/eext_floatingbutton_legacy.h
+++ b/inc/mobile/eext_floatingbutton_legacy.h
@@ -29,4 +29,4 @@
  */
 EAPI Evas_Object *eext_floatingbutton_add(Evas_Object *parent);
 
-//#include "eext_floatingbutton.eo.legacy.h"
+#include "eext_floatingbutton.eo.legacy.h"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1fb03bed55904b4bc9e5f5b196458d0f025994ac..d5139c9d222fbcec1cd99b35af04537433fbe03f 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,29 +40,26 @@ SET(ALL_EO_FILES
        ${WEARABLE_EO_FILES}
        )
 
-#foreach(eo_file ${ALL_EO_FILES})
-#      GET_FILENAME_COMPONENT(dir ${eo_file} PATH)
-#      GET_FILENAME_COMPONENT(eo_file_name ${eo_file} NAME)
-#      string(REPLACE .eo .eo.c out_c_file ${eo_file_name})
-#      string(REPLACE .eo .eo.h out_h_file ${eo_file_name})
-#      string(REPLACE .eo .eo.legacy.h out_legacy_file ${eo_file_name})
-#      string(REPLACE .eo .c c_file ${eo_file_name})
-#      add_custom_command(
-#              OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/${out_c_file}
-#              COMMAND /usr/bin/eolian_gen ${eo_file} -gc -I /usr/share/eolian/include -o ${dir}/${out_c_file}
-#              COMMAND /usr/bin/eolian_gen ${eo_file} -gi -I /usr/share/eolian/include -o ${dir}/${out_c_file}
-#              COMMAND /usr/bin/eolian_gen ${eo_file} -gh -I /usr/share/eolian/include -o "../inc/${dir}/${out_h_file}"
-#              COMMAND /usr/bin/eolian_gen ${eo_file} -gl -I /usr/share/eolian/include -o "../inc/${dir}/${out_legacy_file}"
-#              DEPENDS ${eo_file} ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/*.eo
-#              COMMENT "Compiling Eo: ${eo_file}, Output eo : ${dir}/${out_c_file}"
-#              VERBATIM)
-#      add_custom_target(target_${eo_file_name} ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/${out_c_file})
-#      SET (ALL_EO_TARGETS ${ALL_EO_TARGETS} target_${eo_file_name})
-#endforeach(eo_file)
+foreach(eo_file ${ALL_EO_FILES})
+       GET_FILENAME_COMPONENT(dir ${eo_file} PATH)
+       GET_FILENAME_COMPONENT(eo_file_name ${eo_file} NAME)
+       string(REPLACE .eo .eo.c out_c_file ${eo_file_name})
+       string(REPLACE .eo .c c_file ${eo_file_name})
+       add_custom_command(
+               OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/${out_c_file}
+               COMMAND /usr/bin/eolian_gen -g c -I /usr/share/eolian/include -o "${dir}/${eo_file_name}" ${eo_file}
+               COMMAND /usr/bin/eolian_gen -g h -I /usr/share/eolian/include -o "../inc/${dir}/${eo_file_name}" ${eo_file}
+               COMMAND /usr/bin/eolian_gen -g l -I /usr/share/eolian/include -o "../inc/${dir}/${eo_file_name}" ${eo_file}
+               DEPENDS ${eo_file} ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/*.eo
+               COMMENT "Compiling Eo: ${eo_file}, Output eo : ${dir}/${out_c_file}"
+               VERBATIM)
+       add_custom_target(target_${eo_file_name} ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/${out_c_file})
+       SET (ALL_EO_TARGETS ${ALL_EO_TARGETS} target_${eo_file_name})
+endforeach(eo_file)
 
 
 ADD_LIBRARY(${LIB_NAME} SHARED ${LIB_SRCS})
-#ADD_DEPENDENCIES(${LIB_NAME} ${ALL_EO_TARGETS})
+ADD_DEPENDENCIES(${LIB_NAME} ${ALL_EO_TARGETS})
 
 ADD_DEFINITIONS("-DEFL_EXTENSION_BUILD")
 IF(DEFINED WITH_X)

diff --git a/src/efl_extension_events.c b/src/efl_extension_events.c
index b5e338db449916314a123c669dc453386b3495da..dea024bcda47084829b713f09abaa176b4eaae05 100644 (file)
--- a/src/efl_extension_events.c
+++ b/src/efl_extension_events.c
@@ -170,8 +170,8 @@ _eext_find_event_target(Eina_List *candidates, Evas_Object *parent, Eext_Callbac
    Eina_List *members = NULL;
    Eext_Event_Callback *callback;
 
-//   if (eo_isa(parent, EVAS_OBJECT_SMART_CLASS))
-   if (efl_isa(parent, efl_canvas_group_class_get()))
+//   if (efl_isa(parent, EVAS_OBJECT_SMART_CLASS))
+   if (efl_isa(parent, efl_object_class_get()))
      members = evas_object_smart_members_get(parent);
 
    if (members)

diff --git a/src/mobile/eext_floatingbutton.c b/src/mobile/eext_floatingbutton.c
index 77296f4cd87b26c58a13d61fd48717ea464dd46f..dca51474a5d34904c9efc7e4a8235a1b16350ea9 100644 (file)
--- a/src/mobile/eext_floatingbutton.c
+++ b/src/mobile/eext_floatingbutton.c
@@ -23,8 +23,6 @@
 #include "efl_extension.h"
 #include "efl_extension_private.h"
 
-#if 0
-
 #include <elm_widget.h>
 
 #define MY_CLASS EEXT_FLOATINGBUTTON_CLASS
@@ -748,9 +746,3 @@ _eext_floatingbutton_efl_ui_base_mirrored_set(Eo *obj EINA_UNUSED, Eext_Floating
 }
 
 #include "eext_floatingbutton.eo.c"
-#endif
-
-EAPI Evas_Object *eext_floatingbutton_add(Evas_Object *parent)
-{
-    return NULL;
-}