[EFL] Build break with latest EFL 1.8 libraries.
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Oct 2013 10:01:02 +0000 (10:01 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Oct 2013 10:01:02 +0000 (10:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=123245

Reviewed by Gyuyoung Kim.

After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
Eo typedef and splitted header files which contain version macro.

.:

* Source/cmake/EFLHelpers.cmake: Checked whether include path exist.
* Source/cmake/FindEcore.cmake: Added 1.8 Header which have version macro.
* Source/cmake/FindEdje.cmake: Ditto.
* Source/cmake/FindEina.cmake: Ditto.
* Source/cmake/FindEo.cmake: Ditto.
* Source/cmake/FindEvas.cmake: Ditto.

Source/JavaScriptCore:

* PlatformEfl.cmake: Added EO path to include directories.
* heap/HeapTimer.h: Changed Ecore_Timer typedef when EO exist.

Source/WebCore:

* platform/Widget.h: Changed Eo typedef.
* platform/efl/EflScreenUtilities.h: Ditto.
* platform/graphics/Image.h: Ditto.

Source/WTF:

* wtf/OwnPtrCommon.h: Changed Eo typedef.
* wtf/efl/RefPtrEfl.h: Ditto.

Tools:

* TestWebKitAPI/PlatformWebView.h: Changed Eo typedef.
* WebKitTestRunner/InjectedBundle/TestRunner.h: Ditto.
* WebKitTestRunner/PlatformWebView.h: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157920 268f45cc-cd09-0410-ab3c-d52691b4dbfc

21 files changed:
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformEfl.cmake
Source/JavaScriptCore/heap/HeapTimer.h
Source/WTF/ChangeLog
Source/WTF/wtf/OwnPtrCommon.h
Source/WTF/wtf/efl/RefPtrEfl.h
Source/WebCore/ChangeLog
Source/WebCore/platform/Widget.h
Source/WebCore/platform/efl/EflScreenUtilities.h
Source/WebCore/platform/graphics/Image.h
Source/cmake/EFLHelpers.cmake
Source/cmake/FindEcore.cmake
Source/cmake/FindEdje.cmake
Source/cmake/FindEina.cmake
Source/cmake/FindEo.cmake
Source/cmake/FindEvas.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/PlatformWebView.h
Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
Tools/WebKitTestRunner/PlatformWebView.h

index 44cab4a..7396bcf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Build break with latest EFL 1.8 libraries.
+        https://bugs.webkit.org/show_bug.cgi?id=123245
+
+        Reviewed by Gyuyoung Kim.
+
+        After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
+        Eo typedef and splitted header files which contain version macro.
+
+        * Source/cmake/EFLHelpers.cmake: Checked whether include path exist.
+        * Source/cmake/FindEcore.cmake: Added 1.8 Header which have version macro.
+        * Source/cmake/FindEdje.cmake: Ditto.
+        * Source/cmake/FindEina.cmake: Ditto.
+        * Source/cmake/FindEo.cmake: Ditto.
+        * Source/cmake/FindEvas.cmake: Ditto.
+
 2013-10-22  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [EFL] Remove HAVE_GLX macro
index 9fe3e4c..da1e5a4 100644 (file)
@@ -1,3 +1,16 @@
+2013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Build break with latest EFL 1.8 libraries.
+        https://bugs.webkit.org/show_bug.cgi?id=123245
+
+        Reviewed by Gyuyoung Kim.
+
+        After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
+        Eo typedef and splitted header files which contain version macro.
+
+        * PlatformEfl.cmake: Added EO path to include directories.
+        * heap/HeapTimer.h: Changed Ecore_Timer typedef when EO exist.
+
 2013-10-23  Filip Pizlo  <fpizlo@apple.com>
 
         Put all uses of LLVM intrinsics behind a single Option
index 0a36880..978c37f 100644 (file)
@@ -1,4 +1,5 @@
 list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
     ${ECORE_INCLUDE_DIRS}
     ${EINA_INCLUDE_DIRS}
+    ${EO_INCLUDE_DIRS}
 )
index a94fe28..4d1ee66 100644 (file)
 #elif PLATFORM(BLACKBERRY)
 #include <BlackBerryPlatformTimer.h>
 #elif PLATFORM(EFL)
+#if USE(EO)
+typedef struct _Eo_Opaque Ecore_Timer;
+#else
 typedef struct _Ecore_Timer Ecore_Timer;
 #endif
+#endif
 
 namespace JSC {
 
index 196d0a4..637a99d 100644 (file)
@@ -1,3 +1,16 @@
+2013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Build break with latest EFL 1.8 libraries.
+        https://bugs.webkit.org/show_bug.cgi?id=123245
+
+        Reviewed by Gyuyoung Kim.
+
+        After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
+        Eo typedef and splitted header files which contain version macro.
+
+        * wtf/OwnPtrCommon.h: Changed Eo typedef.
+        * wtf/efl/RefPtrEfl.h: Ditto.
+
 2013-10-24  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GObject bindings] Make EventTarget interface introspectable
index 3f53315..c31847b 100644 (file)
@@ -35,7 +35,7 @@ typedef struct _Ecore_Pipe Ecore_Pipe;
 typedef struct _Eina_Hash Eina_Hash;
 typedef struct _Eina_Module Eina_Module;
 #if USE(EO)
-typedef struct _Eo Evas_Object;
+typedef struct _Eo_Opaque Evas_Object;
 #else
 typedef struct _Evas_Object Evas_Object;
 #endif
index ab56435..9c86286 100644 (file)
@@ -23,7 +23,7 @@
 #include <wtf/RefPtr.h>
 
 #if USE(EO)
-typedef struct _Eo Evas_Object;
+typedef struct _Eo_Opaque Evas_Object;
 #else
 typedef struct _Evas_Object Evas_Object;
 #endif
index 447468c..c46df82 100644 (file)
@@ -1,3 +1,17 @@
+2013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Build break with latest EFL 1.8 libraries.
+        https://bugs.webkit.org/show_bug.cgi?id=123245
+
+        Reviewed by Gyuyoung Kim.
+
+        After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
+        Eo typedef and splitted header files which contain version macro.
+
+        * platform/Widget.h: Changed Eo typedef.
+        * platform/efl/EflScreenUtilities.h: Ditto.
+        * platform/graphics/Image.h: Ditto.
+
 2013-10-24  Andreas Kling  <akling@apple.com>
 
         RenderSVGResource: Pass RenderElement to fill/strokePaintingResource.
index 4c5c371..1a4c891 100644 (file)
@@ -59,7 +59,7 @@ typedef void* PlatformWidget;
 
 #if PLATFORM(EFL)
 #if USE(EO)
-typedef struct _Eo Evas_Object;
+typedef struct _Eo_Opaque Evas_Object;
 #else
 typedef struct _Evas_Object Evas_Object;
 #endif
index 67fb0f0..7d7975a 100644 (file)
@@ -22,7 +22,7 @@
 #include <wtf/text/WTFString.h>
 
 #if USE(EO)
-typedef struct _Eo Evas;
+typedef struct _Eo_Opaque Evas;
 #else
 typedef struct _Evas Evas;
 #endif
index cb77c6f..917c59b 100644 (file)
@@ -60,8 +60,8 @@ typedef struct _GdkPixbuf GdkPixbuf;
 
 #if PLATFORM(EFL)
 #if USE(EO)
-typedef struct _Eo Evas;
-typedef struct _Eo Evas_Object;
+typedef struct _Eo_Opaque Evas;
+typedef struct _Eo_Opaque Evas_Object;
 #else
 typedef struct _Evas Evas;
 typedef struct _Evas_Object Evas_Object;
index 39d4b5b..ab95c7f 100644 (file)
@@ -45,11 +45,12 @@ function(FIND_EFL_LIBRARY _name)
 
     foreach (_current_header ${PARAM_HEADERS})
         find_path(${_current_header}_INCLUDE_DIR NAMES ${_current_header} PATH_SUFFIXES ${PARAM_HEADER_PREFIXES})
-        list(APPEND ${_name}_INCLUDE_DIRS "${${_current_header}_INCLUDE_DIR}")
 
-        if (NOT _version_found)
-            set(_header_path "${${_current_header}_INCLUDE_DIR}/${_current_header}")
-            if (EXISTS ${_header_path})
+        set(_header_path "${${_current_header}_INCLUDE_DIR}/${_current_header}")
+        if (EXISTS ${_header_path})
+            list(APPEND ${_name}_INCLUDE_DIRS "${${_current_header}_INCLUDE_DIR}")
+
+            if (NOT _version_found)
                 file(READ "${_header_path}" _header_contents)
 
                 string(REGEX MATCH "#define +${_name_upper}_VERSION_MAJOR +([0-9]+)" _dummy "${_header_contents}")
index a30863f..bef0bef 100644 (file)
@@ -41,7 +41,7 @@
 include(EFLHelpers)
 
 FIND_EFL_LIBRARY(ECORE
-    HEADERS Ecore.h
+    HEADERS Ecore.h Ecore_Common.h
     HEADER_PREFIXES ecore-1
     LIBRARY ecore
 )
index 509b5a1..290d9a3 100644 (file)
@@ -32,7 +32,7 @@
 include(EFLHelpers)
 
 FIND_EFL_LIBRARY(EDJE
-    HEADERS Edje.h
+    HEADERS Edje.h Edje_Common.h
     HEADER_PREFIXES edje-1
     LIBRARY edje
 )
index 8f9a877..37e43a0 100644 (file)
@@ -31,7 +31,7 @@
 include(EFLHelpers)
 
 FIND_EFL_LIBRARY(EINA
-    HEADERS Eina.h eina_main.h
+    HEADERS Eina.h Eina_Common.h eina_main.h
     HEADER_PREFIXES eina-1 eina-1/eina
     LIBRARY eina
 )
index 59714d1..85ea7d7 100644 (file)
@@ -31,8 +31,8 @@
 include(EFLHelpers)
 
 FIND_EFL_LIBRARY(EO
-    HEADERS Eo.h
-    HEADER_PREFIXES eo-1
+    HEADERS Eo.h Efl_Config.h
+    HEADER_PREFIXES eo-1 efl-1
     LIBRARY eo
 )
 
index 6125781..3dbcc4c 100644 (file)
@@ -31,7 +31,7 @@
 include(EFLHelpers)
 
 FIND_EFL_LIBRARY(EVAS
-    HEADERS Evas.h
+    HEADERS Evas.h Evas_Common.h
     HEADER_PREFIXES evas-1
     LIBRARY evas
 )
index 1f11b24..50f41f1 100644 (file)
@@ -1,3 +1,17 @@
+2013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Build break with latest EFL 1.8 libraries.
+        https://bugs.webkit.org/show_bug.cgi?id=123245
+
+        Reviewed by Gyuyoung Kim.
+
+        After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
+        Eo typedef and splitted header files which contain version macro.
+
+        * TestWebKitAPI/PlatformWebView.h: Changed Eo typedef.
+        * WebKitTestRunner/InjectedBundle/TestRunner.h: Ditto.
+        * WebKitTestRunner/PlatformWebView.h: Ditto.
+
 2013-10-24  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GObject bindings] Make EventTarget interface introspectable
index e8cf1be..8679fa2 100644 (file)
@@ -49,7 +49,7 @@ typedef GtkWidget *PlatformWindow;
 #elif PLATFORM(EFL)
 typedef struct _Ecore_Evas Ecore_Evas;
 #if USE(EO)
-typedef struct _Eo Evas_Object;
+typedef struct _Eo_Opaque Evas_Object;
 #else
 typedef struct _Evas_Object Evas_Object;
 #endif
index 38cef6b..46252ae 100644 (file)
@@ -43,7 +43,7 @@ typedef UINT_PTR PlatformTimerRef;
 typedef unsigned int PlatformTimerRef;
 #elif PLATFORM(EFL)
 #if USE(EO)
-typedef struct _Eo Ecore_Timer;
+typedef struct _Eo_Opaque Ecore_Timer;
 #else
 typedef struct _Ecore_Timer Ecore_Timer;
 #endif
index 23f48a7..d0f4d49 100644 (file)
@@ -48,7 +48,7 @@ typedef GtkWidget* PlatformWindow;
 #elif PLATFORM(EFL)
 typedef struct _Ecore_Evas Ecore_Evas;
 #if USE(EO)
-typedef struct _Eo Evas_Object;
+typedef struct _Eo_Opaque Evas_Object;
 #else
 typedef struct _Evas_Object Evas_Object;
 #endif