[EFL][WK2] Add an option to build WebKit2.
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Dec 2011 10:47:50 +0000 (10:47 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Dec 2011 10:47:50 +0000 (10:47 +0000)
https://bugs.webkit.org/show_bug.cgi?id=61999

.:

Reviewed by Eric Seidel.

* Source/cmake/OptionsEfl.cmake: Set WebKit2_LIBRARY_NAME.

Source/WebKit2:

Reviewed by Eric Seidel.

Add build script for WebKit2 on EFL port.

* CMakeLists.txt:
* PlatformEfl.cmake: Added.

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

ChangeLog
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformEfl.cmake [new file with mode: 0644]
Source/cmake/OptionsEfl.cmake

index fa8242d8064815b18fd4077046a0aa13ba676c6f..086eaa2c9a8a08e81863f271cf9b30047ed6142a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-22  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL][WK2] Add an option to build WebKit2.
+        https://bugs.webkit.org/show_bug.cgi?id=61999
+
+        Reviewed by Eric Seidel.
+
+        * Source/cmake/OptionsEfl.cmake: Set WebKit2_LIBRARY_NAME.
+
 2011-12-22  Daniel Jalkut  <jalkut@red-sweater.com>
 
         ManualTests HTML template should be simplified
index 182641e34a3824921425c0b3b0647ffe414efa7e..3c4a8d0ca566b814f9ebe9160a7c9c7c9cb851b5 100644 (file)
@@ -451,7 +451,7 @@ SET(WebProcess_LIBRARIES
 
 SET(ForwardingHeaders_NAME )
 SET(ForwardingNetworkHeaders_NAME )
-INCLUDE_IF_EXISTS(${WEBKIT2_DIR}/CMakeLists${PORT}.txt)
+INCLUDE_IF_EXISTS(${WEBKIT2_DIR}/Platform${PORT}.cmake)
 
 ADD_DEFINITIONS(-DBUILDING_WEBKIT)
 ADD_DEFINITIONS(-DWTF_USE_JSC=1)
index 31db4f671cfc3b60b9ac4e8b61d5dcfd0af95d2c..192ec899953f16cd84deeb8333c1c2eea07c16be 100644 (file)
@@ -1,3 +1,15 @@
+2011-12-22  Ryuan Choi <ryuan.choi@samsung.com>, Tomasz Morawski <t.morawski@samsung.com>
+
+        [EFL][WK2] Add an option to build WebKit2.
+        https://bugs.webkit.org/show_bug.cgi?id=61999
+
+        Reviewed by Eric Seidel.
+
+        Add build script for WebKit2 on EFL port.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake: Added.
+
 2011-12-21  Eunmi Lee  <eunmi15.lee@samsung.com>
 
         [EFL][WK2] Add efl port's ewk_view files
diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
new file mode 100644 (file)
index 0000000..3608e71
--- /dev/null
@@ -0,0 +1,148 @@
+INCLUDE(WebKitEfl)
+
+LIST(APPEND WebKit2_LINK_FLAGS
+    ${ECORE_X_LDFLAGS}
+    ${EDJE_LDFLAGS}
+    ${EFLDEPS_LDFLAGS}
+    ${EVAS_LDFLAGS}
+)
+
+LIST(APPEND WebKit2_SOURCES
+    Platform/efl/ModuleEfl.cpp
+    Platform/efl/RunLoopEfl.cpp
+    Platform/efl/WorkQueueEfl.cpp
+    Platform/unix/SharedMemoryUnix.cpp
+
+    Platform/CoreIPC/unix/ConnectionUnix.cpp
+    Platform/CoreIPC/unix/AttachmentUnix.cpp
+
+    Shared/API/c/gtk/WKGraphicsContextGtk.cpp
+
+    Shared/cairo/LayerTreeContextCairo.cpp
+    Shared/cairo/ShareableBitmapCairo.cpp
+
+    Shared/efl/NativeWebKeyboardEventEfl.cpp
+    Shared/efl/NativeWebWheelEventEfl.cpp
+    Shared/efl/NativeWebMouseEventEfl.cpp
+    Shared/efl/WebEventFactory.cpp
+    Shared/efl/WebCoreArgumentCodersEfl.cpp
+
+    UIProcess/API/efl/PageClientImpl.cpp
+    UIProcess/API/efl/ewk_view.cpp
+
+    UIProcess/cairo/BackingStoreCairo.cpp
+
+    UIProcess/efl/TextCheckerEfl.cpp
+    UIProcess/efl/WebContextEfl.cpp
+    UIProcess/efl/WebInspectorEfl.cpp
+    UIProcess/efl/WebPageProxyEfl.cpp
+    UIProcess/efl/WebPreferencesEfl.cpp
+
+    UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
+    UIProcess/Launcher/efl/ThreadLauncherEfl.cpp
+
+    UIProcess/Plugins/efl/PluginInfoStoreEfl.cpp
+    UIProcess/Plugins/efl/PluginProcessProxyEfl.cpp
+
+    WebProcess/efl/WebProcessEfl.cpp
+    WebProcess/efl/WebProcessMainEfl.cpp
+
+    WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp
+
+    WebProcess/WebCoreSupport/efl/WebContextMenuClientEfl.cpp
+    WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp
+    WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp
+    WebProcess/WebCoreSupport/efl/WebPopupMenuEfl.cpp
+
+    WebProcess/WebPage/efl/WebInspectorEfl.cpp
+    WebProcess/WebPage/efl/WebPageEfl.cpp
+)
+
+LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
+    "${WEBCORE_DIR}/platform/efl"
+    "${WEBCORE_DIR}/platform/graphics/cairo"
+    "${WEBKIT2_DIR}/Shared/efl"
+    "${WEBKIT2_DIR}/UIProcess/API/efl/"
+    "${WEBKIT2_DIR}/WebProcess/efl"
+    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/efl"
+    ${Cairo_INCLUDE_DIRS}
+    ${ECORE_X_INCLUDE_DIRS}
+    ${EDJE_INCLUDE_DIRS}
+    ${EFLDEPS_INCLUDE_DIRS}
+    ${EVAS_INCLUDE_DIRS}
+    ${LIBXML2_INCLUDE_DIR}
+    ${LIBXSLT_INCLUDE_DIRS}
+    ${SQLITE_INCLUDE_DIRS}
+)
+
+LIST(APPEND WebKit2_LIBRARIES
+    ${Cairo_LIBRARIES}
+    ${ECORE_X_LIBRARIES}
+    ${EFLDEPS_LIBRARIES}
+    ${Freetype_LIBRARIES}
+    ${LIBXML2_LIBRARIES}
+    ${SQLITE_LIBRARIES}
+    ${FONTCONFIG_LIBRARIES}
+    ${PNG_LIBRARY}
+    ${JPEG_LIBRARY}
+    ${CMAKE_DL_LIBS}
+)
+
+LIST (APPEND WebProcess_SOURCES
+    efl/MainEfl.cpp
+)
+
+LIST (APPEND WebProcess_LIBRARIES
+    ${Cairo_LIBRARIES}
+    ${ECORE_X_LIBRARIES}
+    ${EDJE_LIBRARIES}
+    ${EFLDEPS_LIBRARIES}
+    ${EVAS_LIBRARIES}
+    ${LIBXML2_LIBRARIES}
+    ${LIBXSLT_LIBRARIES}
+    ${SQLITE_LIBRARIES}
+)
+
+ADD_CUSTOM_TARGET(forwarding-headerEfl
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
+)
+SET(ForwardingHeaders_NAME forwarding-headerEfl)
+
+IF (WTF_USE_SOUP)
+    LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
+        "${WEBCORE_DIR}/platform/network/soup"
+        ${LIBSOUP24_INCLUDE_DIRS}
+    )
+    LIST(APPEND WebKit2_LIBRARIES ${LIBSOUP24_LIBRARIES})
+    LIST(APPEND WebKit2_SOURCES
+        WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
+        WebProcess/Downloads/soup/DownloadSoup.cpp
+    )
+
+    ADD_CUSTOM_TARGET(forwarding-headerSoup
+        COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
+    )
+    SET(ForwardingNetworkHeaders_NAME forwarding-headerSoup)
+ENDIF ()
+
+IF (WTF_USE_CURL)
+    LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
+        "${WEBCORE_DIR}/platform/network/curl"
+        ${CURL_INCLUDE_DIRS}
+    )
+    LIST(APPEND WebKit2_LIBRARIES ${CURL_LIBRARIES})
+    LIST(APPEND WebKit2_SOURCES
+        WebProcess/Cookies/curl/WebCookieManagerCurl.cpp
+        WebProcess/Downloads/curl/DownloadCurl.cpp
+    )
+ENDIF ()
+
+IF (ENABLE_GLIB_SUPPORT)
+    LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
+        ${Glib_INCLUDE_DIRS}
+        ${JAVASCRIPTCORE_DIR}/wtf/gobject
+    )
+    LIST(APPEND WebKit2_LIBRARIES
+        ${Glib_LIBRARIES}
+    )
+ENDIF ()
index 939262edd88c1d35349fd53afaab61b0b56e0075..97da61136f9d561948a7672380dd2603acd05b08 100644 (file)
@@ -53,6 +53,7 @@ SET(WTF_LIBRARY_NAME wtf_efl)
 SET(JavaScriptCore_LIBRARY_NAME javascriptcore_efl)
 SET(WebCore_LIBRARY_NAME webcore_efl)
 SET(WebKit_LIBRARY_NAME ewebkit)
+SET(WebKit2_LIBRARY_NAME ewebkit2)
 
 SET(DATA_INSTALL_DIR "share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR}" CACHE PATH "Installation path for theme data")
 SET(THEME_BINARY_DIR ${CMAKE_BINARY_DIR}/WebKit/efl/DefaultTheme)