[EFL] Default.edj should be generated although ENABLE_WEBKIT disabled.

https://bugs.webkit.org/show_bug.cgi?id=97753

Reviewed by Laszlo Gombos.

default.edj is used in both webkit/efl and webkit2/efl.
However, it has been generated only when ENABLE_WEBKIT is enabled.

This patch separates the script which generates default.edj
from source/webkit/platformefl.cmake.

.:

* Source/CMakeLists.txt:
* Source/PlatformEfl.cmake: Added to generate custom target for default theme.
* Source/cmake/OptionsEfl.cmake:
Moved directory generation from WebKit/PlatformEfl.cmake
because THEME_BINARY_DIR is used for both Default Theme and control theme in Tools.

Source/WebKit:

* PlatformEfl.cmake: Extracted codes which is related to default.edj.

Source/WebKit/efl:

* DefaultTheme/CMakeLists.txt:
Extracted from Source/WebKit/PlatformEfl.cmake and sanitized.

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

diff --git a/ChangeLog b/ChangeLog
index 170a671..317ce97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2012-10-03  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Default.edj should be generated although ENABLE_WEBKIT disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=97753
+
+        Reviewed by Laszlo Gombos.
+
+        default.edj is used in both webkit/efl and webkit2/efl.
+        However, it has been generated only when ENABLE_WEBKIT is enabled.
+
+        This patch separates the script which generates default.edj
+        from source/webkit/platformefl.cmake.
+
+        * Source/CMakeLists.txt:
+        * Source/PlatformEfl.cmake: Added to generate custom target for default theme.
+        * Source/cmake/OptionsEfl.cmake:
+        Moved directory generation from WebKit/PlatformEfl.cmake
+        because THEME_BINARY_DIR is used for both Default Theme and control theme in Tools.
+
 2012-10-03  Otto Derek Cheung  <otcheung@rim.com>
 
         [BlackBerry] Implementing the NetworkInfo API for BB port 

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index fb3092a..a1d410e 100644 (file)
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -21,6 +21,8 @@ IF (ENABLE_WEBKIT2)
     ADD_SUBDIRECTORY(WebKit2)
 ENDIF ()
 
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
 # -----------------------------------------------------------------------------
 # Set compiler flags for all targets
 # -----------------------------------------------------------------------------

diff --git a/Source/PlatformEfl.cmake b/Source/PlatformEfl.cmake
new file mode 100644 (file)
index 0000000..5406615
--- /dev/null
+++ b/Source/PlatformEfl.cmake
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(${WEBKIT_DIR}/efl/DefaultTheme)

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 871bb59..250d438 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2012-10-03  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Default.edj should be generated although ENABLE_WEBKIT disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=97753
+
+        Reviewed by Laszlo Gombos.
+
+        default.edj is used in both webkit/efl and webkit2/efl.
+        However, it has been generated only when ENABLE_WEBKIT is enabled.
+
+        This patch separates the script which generates default.edj
+        from source/webkit/platformefl.cmake.
+
+        * PlatformEfl.cmake: Extracted codes which is related to default.edj.
+
 2012-10-03  Otto Derek Cheung  <otcheung@rim.com>
 
         [BlackBerry] Implementing the NetworkInfo API for BB port

diff --git a/Source/WebKit/PlatformEfl.cmake b/Source/WebKit/PlatformEfl.cmake
index 7a54713..f9b8856 100644 (file)
--- a/Source/WebKit/PlatformEfl.cmake
+++ b/Source/WebKit/PlatformEfl.cmake
@@ -152,113 +152,6 @@ LIST(APPEND WebKit_LIBRARIES
     ${LIBSOUP_LIBRARIES}
 )
 
-SET(WebKit_THEME_DEFINITION "")
-IF (ENABLE_PROGRESS_ELEMENT)
-  LIST(APPEND WebKit_THEME_DEFINITION "-DENABLE_PROGRESS_ELEMENT")
-ENDIF ()
-
-FILE(MAKE_DIRECTORY ${THEME_BINARY_DIR})
-SET(WebKit_THEME ${THEME_BINARY_DIR}/default.edj)
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${WebKit_THEME}
-  COMMAND ${EDJE_CC_EXECUTABLE} -v -id ${WEBKIT_DIR}/efl/DefaultTheme ${WebKit_THEME_DEFINITION} ${WEBKIT_DIR}/efl/DefaultTheme/default.edc ${WebKit_THEME}
-  DEPENDS
-    ${WEBKIT_DIR}/efl/DefaultTheme/default.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/button/button.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/button/img_button_focus.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/button/img_button_hover.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/button/img_button_normal.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/button/img_button_press.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/check.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/img_check_off_focus.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/img_check_off_hover.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/img_check_off.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/img_check_on_focus.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/img_check_on_hover.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/img_check_on.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_focus_button.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_focus.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_hover_button.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_hover.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_normal_button.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_normal.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_press_button.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_press.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/icon.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/entry/entry.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/entry/img_focused.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/entry/img_hovered.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/entry/img_normal.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file_focus.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file_hover.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file_normal.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file_press.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/fullscreenbutton/fullscreen_button.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/mutebutton/mute_button.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/mutebutton/mutebutton.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/mutebutton/unmutebutton.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/playpausebutton/pausebutton.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playbutton.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playpause_button.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/progressbar/bt_base.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/progressbar/progressbar.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/progressbar/shelf_inset.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/img_radio_off_focus.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/img_radio_off_hover.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/img_radio_off.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/img_radio_on_focus.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/img_radio_on_hover.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/img_radio_on.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/radio.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/scrollbar/scrollbar.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/scrollbar/scrollbar_h.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/scrollbar/scrollbar_knob_h.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/scrollbar/scrollbar_knob_v.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/scrollbar/scrollbar_v.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/cancel/cancel_normal_button2.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/cancel/cancel_normal_button.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/cancel/search_cancel.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/decoration/decoration_normal_button.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/decoration/search_decoration.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/field/field_focused.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/field/field_hovered.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/field/field_normal.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/field/search_field.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_fill_h.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_fill_v.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_h.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_thumb_h.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_thumb_press_h.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_thumb_press_v.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_thumb_v.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_v.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/spinner/sp_bg.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/spinner/sp_down_default.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/spinner/sp_down_hover.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/spinner/sp_down_pressed.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/spinner/spinner.edc
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/spinner/sp_up_default.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/spinner/sp_up_hover.png
-    ${WEBKIT_DIR}/efl/DefaultTheme/widget/spinner/sp_up_pressed.png
-  VERBATIM
-)
-
-LIST(APPEND WebKit_SOURCES
-     ${WebKit_THEME}
-)
-
 IF (SHARED_CORE)
     SET(LIBS_PRIVATE "-l${WTF_LIBRARY_NAME} -l${JavaScriptCore_LIBRARY_NAME} -l${WebCore_LIBRARY_NAME}")
 ELSE ()
@@ -298,9 +191,6 @@ SET(EWebKit_HEADERS
 INSTALL(FILES ${EWebKit_HEADERS}
         DESTINATION include/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
 
-INSTALL(FILES ${WebKit_THEME}
-        DESTINATION ${DATA_INSTALL_DIR}/themes)
-
 INCLUDE_DIRECTORIES(${THIRDPARTY_DIR}/gtest/include)
 
 SET(EWKUnitTests_LIBRARIES

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index 166da11..c8780c8 100644 (file)
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,19 @@
+2012-10-03  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Default.edj should be generated although ENABLE_WEBKIT disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=97753
+
+        Reviewed by Laszlo Gombos.
+
+        default.edj is used in both webkit/efl and webkit2/efl.
+        However, it has been generated only when ENABLE_WEBKIT is enabled.
+
+        This patch separates the script which generates default.edj
+        from source/webkit/platformefl.cmake.
+
+        * DefaultTheme/CMakeLists.txt:
+        Extracted from Source/WebKit/PlatformEfl.cmake and sanitized.
+
 2012-10-03  Christophe Dumez  <christophe.dumez@intel.com>
 
         [EFL] Enable use of X11 in DumpRenderTree / WebKitTestRunner

diff --git a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
new file mode 100644 (file)
index 0000000..850749e
--- /dev/null
+++ b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
@@ -0,0 +1,110 @@
+SET(DefaultTheme_RESOURCE_NAME default.edj)
+SET(DefaultTheme_DIR "${WEBKIT_DIR}/efl/DefaultTheme")
+
+SET(DefaultTheme_DEFINITION "")
+IF (ENABLE_PROGRESS_ELEMENT)
+    LIST(APPEND DefaultTheme_DEFINITION "-DENABLE_PROGRESS_ELEMENT")
+ENDIF ()
+
+ADD_CUSTOM_COMMAND(
+    OUTPUT ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME}
+    COMMAND ${EDJE_CC_EXECUTABLE} -v ${DefaultTheme_DEFINITION} default.edc ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME}
+    DEPENDS
+        default.edc
+        widget/button/button.edc
+        widget/button/img_button_focus.png
+        widget/button/img_button_hover.png
+        widget/button/img_button_normal.png
+        widget/button/img_button_press.png
+        widget/check/check.edc
+        widget/check/img_check_off_focus.png
+        widget/check/img_check_off_hover.png
+        widget/check/img_check_off.png
+        widget/check/img_check_on_focus.png
+        widget/check/img_check_on_hover.png
+        widget/check/img_check_on.png
+        widget/combo/combo.edc
+        widget/combo/combo_focus_button.png
+        widget/combo/combo_focus.png
+        widget/combo/combo_hover_button.png
+        widget/combo/combo_hover.png
+        widget/combo/combo_normal_button.png
+        widget/combo/combo_normal.png
+        widget/combo/combo_press_button.png
+        widget/combo/combo_press.png
+        widget/combo/icon.png
+        widget/entry/entry.edc
+        widget/entry/img_focused.png
+        widget/entry/img_hovered.png
+        widget/entry/img_normal.png
+        widget/file/file.edc
+        widget/file/file_focus.png
+        widget/file/file_hover.png
+        widget/file/file_normal.png
+        widget/file/file_press.png
+        widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png
+        widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png
+        widget/mediacontrol/fullscreenbutton/fullscreen_button.edc
+        widget/mediacontrol/mutebutton/mute_button.edc
+        widget/mediacontrol/mutebutton/mutebutton.png
+        widget/mediacontrol/mutebutton/unmutebutton.png
+        widget/mediacontrol/playpausebutton/pausebutton.png
+        widget/mediacontrol/playpausebutton/playbutton.png
+        widget/mediacontrol/playpausebutton/playpause_button.edc
+        widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc
+        widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png
+        widget/mediacontrol/seekforwardbutton/seekforward_button.edc
+        widget/mediacontrol/seekforwardbutton/seekforwardbutton.png
+        widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png
+        widget/mediacontrol/togglecaptionsbutton/closedcaption.png
+        widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc
+        widget/progressbar/bt_base.png
+        widget/progressbar/progressbar.edc
+        widget/progressbar/shelf_inset.png
+        widget/radio/img_radio_off_focus.png
+        widget/radio/img_radio_off_hover.png
+        widget/radio/img_radio_off.png
+        widget/radio/img_radio_on_focus.png
+        widget/radio/img_radio_on_hover.png
+        widget/radio/img_radio_on.png
+        widget/radio/radio.edc
+        widget/scrollbar/scrollbar.edc
+        widget/scrollbar/scrollbar_h.png
+        widget/scrollbar/scrollbar_knob_h.png
+        widget/scrollbar/scrollbar_knob_v.png
+        widget/scrollbar/scrollbar_v.png
+        widget/search/cancel/cancel_normal_button2.png
+        widget/search/cancel/cancel_normal_button.png
+        widget/search/cancel/search_cancel.edc
+        widget/search/decoration/decoration_normal_button.png
+        widget/search/decoration/search_decoration.edc
+        widget/search/field/field_focused.png
+        widget/search/field/field_hovered.png
+        widget/search/field/field_normal.png
+        widget/search/field/search_field.edc
+        widget/slider/slider.edc
+        widget/slider/slider_fill_h.png
+        widget/slider/slider_fill_v.png
+        widget/slider/slider_h.png
+        widget/slider/slider_thumb_h.png
+        widget/slider/slider_thumb_press_h.png
+        widget/slider/slider_thumb_press_v.png
+        widget/slider/slider_thumb_v.png
+        widget/slider/slider_v.png
+        widget/spinner/sp_bg.png
+        widget/spinner/sp_down_default.png
+        widget/spinner/sp_down_hover.png
+        widget/spinner/sp_down_pressed.png
+        widget/spinner/spinner.edc
+        widget/spinner/sp_up_default.png
+        widget/spinner/sp_up_hover.png
+        widget/spinner/sp_up_pressed.png
+    WORKING_DIRECTORY ${DefaultTheme_DIR}
+    VERBATIM
+)
+
+ADD_CUSTOM_TARGET(DefaultTheme ALL
+    DEPENDS ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME}
+)
+
+INSTALL(FILES ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME} DESTINATION ${DATA_INSTALL_DIR}/themes)

diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index 050791e..ba51884 100644 (file)
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -46,6 +46,7 @@ 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)
+FILE(MAKE_DIRECTORY ${THEME_BINARY_DIR})
 
 SET(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")