[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 13:01:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 02bca691d61a690a90ea71af4b78ad4efca921e1
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Sep 4 22:04:00 2010 +0000
2010-09-04 Lucas De Marchi <lucas.demarchi at profusion.mobi>
Reviewed by Kenneth Rohde Christiansen.
[EFL] Move test browser to WebKitTools directory
https://bugs.webkit.org/show_bug.cgi?id=45212
Follow other ports like QT and GTK which moved the test browser to
WebKitTools directory.
* CMakeLists.txt: Include test browser if port defines one.
2010-09-04 Lucas De Marchi <lucas.demarchi at profusion.mobi>
Reviewed by Kenneth Rohde Christiansen.
[EFL] Move test browser to WebKitTools directory
https://bugs.webkit.org/show_bug.cgi?id=45212
Follow other ports like QT and GTK which moved the test browser to
WebKitTools directory.
* CMakeListsEfl.txt: Remove build for test browser.
* EWebLauncher/main.c: Removed.
2010-09-04 Lucas De Marchi <lucas.demarchi at profusion.mobi>
Reviewed by Kenneth Rohde Christiansen.
[EFL] Move test browser to WebKitTools directory
https://bugs.webkit.org/show_bug.cgi?id=45212
Follow other ports like QT and GTK which moved the test browser to
WebKitTools directory.
* CMakeListsEfl.txt: Added.
* EWebLauncher/main.c: Added.
(print_history):
(zoom_level_set):
(on_ecore_evas_resize):
(title_set):
(viewport_set):
(on_title_changed):
(on_progress):
(on_load_finished):
(on_toolbars_visible_set):
(on_toolbars_visible_get):
(on_statusbar_visible_set):
(on_statusbar_visible_get):
(on_scrollbars_visible_set):
(on_scrollbars_visible_get):
(on_menubar_visible_set):
(on_menubar_visible_get):
(on_tooltip_text_set):
(on_inputmethod_changed):
(on_viewport_changed):
(on_mouse_down):
(on_focus_out):
(on_focus_in):
(on_resized):
(on_key_down):
(on_browser_del):
(on_closeWindow):
(quit):
(browserCreate):
(browserDestroy):
(closeWindow):
(main_signal_exit):
(findThemePath):
(main):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66797 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e4b60e..6df2017 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
+SET(WEBKITTOOLS_DIR "${CMAKE_SOURCE_DIR}/WebKitTools")
SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
INCLUDE(WebKitMacros)
@@ -107,6 +108,11 @@ ADD_SUBDIRECTORY(WebCore)
ADD_SUBDIRECTORY(WebKit)
# -----------------------------------------------------------------------------
+# Add test browser if exists
+# -----------------------------------------------------------------------------
+INCLUDE_IF_EXISTS(${WEBKITTOOLS_DIR}/CMakeLists${PORT}.txt)
+
+# -----------------------------------------------------------------------------
# Set compiler flags for all targets
# -----------------------------------------------------------------------------
WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WTF_LIBRARY_NAME})
diff --git a/ChangeLog b/ChangeLog
index 1140ad1..436e485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-04 Lucas De Marchi <lucas.demarchi at profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Move test browser to WebKitTools directory
+ https://bugs.webkit.org/show_bug.cgi?id=45212
+
+ Follow other ports like QT and GTK which moved the test browser to
+ WebKitTools directory.
+
+ * CMakeLists.txt: Include test browser if port defines one.
+
2010-09-02 Lucas De Marchi <lucas.demarchi at profusion.mobi>
Reviewed by Antonio Gomes.
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index 0203865..cff1822 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -159,54 +159,6 @@ ADD_CUSTOM_COMMAND(
VERBATIM
)
-SET(EWebLauncher_SOURCES
- efl/DefaultTheme/default.edj
- efl/EWebLauncher/main.c
-)
-
-SET(EWebLauncher_LIBRARIES
- ${JavaScriptCore_LIBRARY_NAME}
- ${WebCore_LIBRARY_NAME}
- ${WebKit_LIBRARY_NAME}
- ${Cairo_LIBRARIES}
- ${ECORE_X_LIBRARIES}
- ${EDJE_LIBRARIES}
- ${EFLDEPS_LIBRARIES}
- ${EVAS_LIBRARIES}
- ${LIBXML2_LIBRARIES}
- ${LIBXSLT_LIBRARIES}
- ${SQLITE_LIBRARIES}
-)
-
-SET(EWebLauncher_LINK_FLAGS
- ${ECORE_X_LDFLAGS}
- ${EDJE_LDFLAGS}
- ${EFLDEPS_LDFLAGS}
- ${EVAS_LDFLAGS}
-)
-
-IF (ENABLE_GLIB_SUPPORT)
- LIST(APPEND EWebLauncher_LIBRARIES
- ${Gdk_LIBRARIES}
- ${Glib_LIBRARIES}
- ${Gthread_LIBRARIES}
- )
-ENDIF ()
-
-IF (WTF_USE_SOUP)
- LIST(APPEND EWebLauncher_LIBRARIES ${LIBSOUP24_LIBRARIES})
- LIST(APPEND EWebLauncher_LINK_FLAGS ${LIBSOUP24_LDFLAGS})
-ENDIF ()
-
-IF (WTF_USE_CURL)
- LIST(APPEND EWebLauncher_LIBRARIES ${CURL_LIBRARIES})
- LIST(APPEND EWebLauncher_LINK_FLAGS ${CURL_LDFLAGS})
-ENDIF ()
-
-ADD_EXECUTABLE(../Programs/EWebLauncher ${EWebLauncher_SOURCES})
-TARGET_LINK_LIBRARIES(../Programs/EWebLauncher ${EWebLauncher_LIBRARIES})
-ADD_TARGET_PROPERTIES(../Programs/EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
-
IF (SHARED_CORE)
SET(LIBS_PRIVATE "-l${WTF_LIBRARY_NAME} -l${JavaScriptCore_LIBRARY_NAME} -l${WebCore_LIBRARY_NAME}")
ELSE ()
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 3300e14..c794513 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-04 Lucas De Marchi <lucas.demarchi at profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Move test browser to WebKitTools directory
+ https://bugs.webkit.org/show_bug.cgi?id=45212
+
+ Follow other ports like QT and GTK which moved the test browser to
+ WebKitTools directory.
+
+ * CMakeListsEfl.txt: Remove build for test browser.
+ * EWebLauncher/main.c: Removed.
+
2010-09-03 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
Reviewed by Darin Adler.
diff --git a/WebKitTools/CMakeListsEfl.txt b/WebKitTools/CMakeListsEfl.txt
new file mode 100644
index 0000000..b9086ac
--- /dev/null
+++ b/WebKitTools/CMakeListsEfl.txt
@@ -0,0 +1,56 @@
+SET(EWebLauncher_SOURCES
+ ${WebKit_THEME}
+ ${WEBKITTOOLS_DIR}/EWebLauncher/main.c
+)
+
+SET(EWebLauncher_LIBRARIES
+ ${JavaScriptCore_LIBRARY_NAME}
+ ${WebCore_LIBRARY_NAME}
+ ${WebKit_LIBRARY_NAME}
+ ${Cairo_LIBRARIES}
+ ${ECORE_X_LIBRARIES}
+ ${EDJE_LIBRARIES}
+ ${EFLDEPS_LIBRARIES}
+ ${EVAS_LIBRARIES}
+ ${LIBXML2_LIBRARIES}
+ ${LIBXSLT_LIBRARIES}
+ ${SQLITE_LIBRARIES}
+)
+
+SET(EWebLauncher_INCLUDE_DIRECTORIES
+ "${WEBKIT_DIR}/efl/ewk"
+ ${Cairo_INCLUDE_DIRS}
+ ${EDJE_INCLUDE_DIRS}
+ ${EFLDEPS_INCLUDE_DIRS}
+ ${EVAS_INCLUDE_DIRS}
+)
+
+SET(EWebLauncher_LINK_FLAGS
+ ${ECORE_X_LDFLAGS}
+ ${EDJE_LDFLAGS}
+ ${EFLDEPS_LDFLAGS}
+ ${EVAS_LDFLAGS}
+)
+
+IF (ENABLE_GLIB_SUPPORT)
+ LIST(APPEND EWebLauncher_LIBRARIES
+ ${Gdk_LIBRARIES}
+ ${Glib_LIBRARIES}
+ ${Gthread_LIBRARIES}
+ )
+ENDIF ()
+
+IF (WTF_USE_SOUP)
+ LIST(APPEND EWebLauncher_LIBRARIES ${LIBSOUP24_LIBRARIES})
+ LIST(APPEND EWebLauncher_LINK_FLAGS ${LIBSOUP24_LDFLAGS})
+ENDIF ()
+
+IF (WTF_USE_CURL)
+ LIST(APPEND EWebLauncher_LIBRARIES ${CURL_LIBRARIES})
+ LIST(APPEND EWebLauncher_LINK_FLAGS ${CURL_LDFLAGS})
+ENDIF ()
+
+INCLUDE_DIRECTORIES(${EWebLauncher_INCLUDE_DIRECTORIES})
+ADD_EXECUTABLE(Programs/EWebLauncher ${EWebLauncher_SOURCES})
+TARGET_LINK_LIBRARIES(Programs/EWebLauncher ${EWebLauncher_LIBRARIES})
+ADD_TARGET_PROPERTIES(Programs/EWebLauncher LINK_FLAGS "${EWebLauncher_LINK_FLAGS}")
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 12be5e5..35bd577 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,49 @@
+2010-09-04 Lucas De Marchi <lucas.demarchi at profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Move test browser to WebKitTools directory
+ https://bugs.webkit.org/show_bug.cgi?id=45212
+
+ Follow other ports like QT and GTK which moved the test browser to
+ WebKitTools directory.
+
+ * CMakeListsEfl.txt: Added.
+ * EWebLauncher/main.c: Added.
+ (print_history):
+ (zoom_level_set):
+ (on_ecore_evas_resize):
+ (title_set):
+ (viewport_set):
+ (on_title_changed):
+ (on_progress):
+ (on_load_finished):
+ (on_toolbars_visible_set):
+ (on_toolbars_visible_get):
+ (on_statusbar_visible_set):
+ (on_statusbar_visible_get):
+ (on_scrollbars_visible_set):
+ (on_scrollbars_visible_get):
+ (on_menubar_visible_set):
+ (on_menubar_visible_get):
+ (on_tooltip_text_set):
+ (on_inputmethod_changed):
+ (on_viewport_changed):
+ (on_mouse_down):
+ (on_focus_out):
+ (on_focus_in):
+ (on_resized):
+ (on_key_down):
+ (on_browser_del):
+ (on_closeWindow):
+ (quit):
+ (browserCreate):
+ (browserDestroy):
+ (closeWindow):
+ (main_signal_exit):
+ (findThemePath):
+ (main):
+
2010-09-03 Simon Fraser <simon.fraser at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKit/efl/EWebLauncher/main.c b/WebKitTools/EWebLauncher/main.c
similarity index 100%
rename from WebKit/efl/EWebLauncher/main.c
rename to WebKitTools/EWebLauncher/main.c
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list