git://git.webkit.org / WebKit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3f0d66e)
2010-09-04 Lucas De Marchi <lucas.demarchi@profusion.mobi>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 4 Sep 2010 22:04:00 +0000 (22:04 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 4 Sep 2010 22:04:00 +0000 (22:04 +0000)
        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@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@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

CMakeLists.txt patch | blob | history
ChangeLog patch | blob | history
WebKit/efl/CMakeListsEfl.txt patch | blob | history
WebKit/efl/ChangeLog patch | blob | history
WebKitTools/CMakeListsEfl.txt [new file with mode: 0644] patch | blob
WebKitTools/ChangeLog patch | blob | history
WebKitTools/EWebLauncher/main.c [moved from WebKit/efl/EWebLauncher/main.c with 100% similarity] patch | blob | history

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e4b60ec8b84ea3952525b4c2c7e583ab3456354..6df2017d304fa49e65da2e1529ebe4383f9db18d 100644 (file)
--- 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)
@@ -106,6 +107,11 @@ ADD_SUBDIRECTORY(JavaScriptCore)
 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
 # -----------------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 1140ad1f6f7c574d7793666b1354bdb7a20058f7..436e4854afcb55b14b59cf3222d9b2ddcb05fff6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-04  Lucas De Marchi  <lucas.demarchi@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@profusion.mobi>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index 0203865b41467f25f6f6a59222120a8ed7249ebf..cff1822d821797a8cb85fd57932e4d2f58f128a4 100644 (file)
--- 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 3300e14047250eb0de1c57fd032abe01c4d0f103..c794513f503f4ac1885e194ccf917fcdeb1c5e47 100644 (file)
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-04  Lucas De Marchi  <lucas.demarchi@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@openbossa.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/CMakeListsEfl.txt b/WebKitTools/CMakeListsEfl.txt
new file mode 100644 (file)
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 12be5e57b7d3995c1292001e824ad7bbb92f22df..35bd577764bc36753665f3bca285dbc8aef49e23 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,49 @@
+2010-09-04  Lucas De Marchi  <lucas.demarchi@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@apple.com>
 
         Reviewed by Adam Roben.
Mirror of the WebKit open source project on svn.webkit.org.