[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:59:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 40fdb72ab7f20d35b2ffdf2ca16dce99614fc940
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 12 17:16:22 2010 +0000
2010-08-12 Rafael Antognolli <antognolli at profusion.mobi>
Reviewed by Kenneth Rohde Christiansen.
[EFL] Making CMake keep track of theme dependencies.
https://bugs.webkit.org/show_bug.cgi?id=43862
Removing unused macro GENERATE_EDJ.
* cmake/WebKitEfl.cmake:
2010-08-12 Rafael Antognolli <antognolli at profusion.mobi>
Reviewed by Kenneth Rohde Christiansen.
[EFL] Making CMake keep track of theme dependencies.
https://bugs.webkit.org/show_bug.cgi?id=43862
Adding theme source files and images as dependencies of the theme.
* CMakeListsEfl.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index ecb8cf1..6ea40de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-12 Rafael Antognolli <antognolli at profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Making CMake keep track of theme dependencies.
+ https://bugs.webkit.org/show_bug.cgi?id=43862
+
+ Removing unused macro GENERATE_EDJ.
+
+ * cmake/WebKitEfl.cmake:
+
2010-08-12 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65225.
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index f6b96fd..e5fb9ef 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -73,10 +73,74 @@ IF (WTF_USE_CURL)
ENDIF ()
FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/WebKit/efl/DefaultTheme)
-GENERATE_EDJ(
+SET(WebKit_THEME ${CMAKE_BINARY_DIR}/WebKit/efl/DefaultTheme/default.edj)
+ADD_CUSTOM_COMMAND(
+ OUTPUT ${WebKit_THEME}
+ COMMAND ${EDJE_CC_EXECUTABLE} -v -id ${WEBKIT_DIR}/efl/DefaultTheme ${WEBKIT_DIR}/efl/DefaultTheme/default.edc ${WebKit_THEME}
+ DEPENDS
${WEBKIT_DIR}/efl/DefaultTheme/default.edc
- ${CMAKE_BINARY_DIR}/WebKit/efl/DefaultTheme/default.edj
- "-id;${WEBKIT_DIR}/efl/DefaultTheme"
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_knob_v.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_knob_press_v.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_v.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider.edc
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_knob_press_h.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_knob_h.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_fill_v.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_fill_h.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/slider/slider_h.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_focus_button.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_press.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/icon.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_normal.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_focus.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_hover_button.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo.edc
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/combo/combo_press_button.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/decoration/search_decoration.edc
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/decoration/decoration_normal_button.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/field/field_hovered.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/field/search_field.edc
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/field/field_normal.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/field/field_focused.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/cancel/cancel_normal_button.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/cancel/cancel_normal_button2.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/search/cancel/search_cancel.edc
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/img_check_off_focus.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/check.edc
+ ${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_off_hover.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/img_check_off.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/check/img_check_on.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/img_radio_on.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_on_focus.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/radio.edc
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/img_radio_off.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/radio/img_radio_on_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/button/img_button_focus.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/button/img_button_hover.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/button/button.edc
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/entry/entry.edc
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/entry/img_normal.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/entry/img_focused.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/entry/img_hovered.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/scrollbar/scrollbar_h.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/scrollbar/scrollbar_v.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/scrollbar/scrollbar_knob_v.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/scrollbar/scrollbar_knob_h.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/scrollbar/scrollbar.edc
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file_normal.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file_press.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file_hover.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file_focus.png
+ ${WEBKIT_DIR}/efl/DefaultTheme/widget/file/file.edc
+ VERBATIM
)
SET(EWebLauncher_SOURCES
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 5152692..f6cf1d0 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-12 Rafael Antognolli <antognolli at profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Making CMake keep track of theme dependencies.
+ https://bugs.webkit.org/show_bug.cgi?id=43862
+
+ Adding theme source files and images as dependencies of the theme.
+
+ * CMakeListsEfl.txt:
+
2010-08-11 Rafael Antognolli <antognolli at profusion.mobi>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/cmake/WebKitEfl.cmake b/cmake/WebKitEfl.cmake
index 0cbf265..06bd060 100644
--- a/cmake/WebKitEfl.cmake
+++ b/cmake/WebKitEfl.cmake
@@ -4,14 +4,3 @@ FIND_PROGRAM(EDJE_CC_EXECUTABLE edje_cc)
IF (NOT EDJE_CC_EXECUTABLE)
MESSAGE(FATAL_ERROR "Missing edje_cc")
ENDIF ()
-
-# - Generate Edje compiled from the given source
-# GENERATE_EDJ(source binary edje_cc_options)
-#
-# This runs edje_cc -v ${edje_cc_options} ${source} ${binary}
-MACRO(GENERATE_EDJ _edc _edj _edje_cc_opts)
- ADD_CUSTOM_COMMAND(
- OUTPUT ${_edj}
- COMMAND ${EDJE_CC_EXECUTABLE} -v ${_edje_cc_opts} ${_edc} ${_edj}
- VERBATIM)
-ENDMACRO()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list