Cleanup CMake files in WebKit
authorparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 23 Sep 2013 08:09:08 +0000 (08:09 +0000)
committerparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 23 Sep 2013 08:09:08 +0000 (08:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=121763

Reviewed by Gyuyoung Kim.

Sort files and unify style.

* PlatformBlackBerry.cmake:
* PlatformEfl.cmake:
* PlatformWinCE.cmake:

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

Source/WebKit/ChangeLog
Source/WebKit/PlatformBlackBerry.cmake
Source/WebKit/PlatformEfl.cmake
Source/WebKit/PlatformWinCE.cmake

index a598960..d1844d5 100644 (file)
@@ -1,3 +1,16 @@
+2013-09-23  Patrick Gansterer  <paroga@webkit.org>
+
+        Cleanup CMake files in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=121763
+
+        Reviewed by Gyuyoung Kim.
+
+        Sort files and unify style.
+
+        * PlatformBlackBerry.cmake:
+        * PlatformEfl.cmake:
+        * PlatformWinCE.cmake:
+
 2013-09-20  Brent Fulgham  <bfulgham@apple.com>
 
         [Windows] Unreviewed build fix after r156216.
index 40c8915..5da316b 100644 (file)
@@ -70,6 +70,7 @@ list(APPEND WebKit_SOURCES
     blackberry/Api/BackingStore.cpp
     blackberry/Api/BlackBerryGlobal.cpp
     blackberry/Api/InRegionScroller.cpp
+    blackberry/Api/JavaScriptVariant.cpp
     blackberry/Api/WebAnimation.cpp
     blackberry/Api/WebCookieJar.cpp
     blackberry/Api/WebKitMIMETypeConverter.cpp
@@ -81,7 +82,7 @@ list(APPEND WebKit_SOURCES
     blackberry/Api/WebPageGroupLoadDeferrer.cpp
     blackberry/Api/WebSettings.cpp
     blackberry/Api/WebViewportArguments.cpp
-    blackberry/Api/JavaScriptVariant.cpp
+
     blackberry/WebCoreSupport/AutofillManager.cpp
     blackberry/WebCoreSupport/BackForwardListBlackBerry.cpp
     blackberry/WebCoreSupport/CacheClientBlackBerry.cpp
@@ -97,25 +98,27 @@ list(APPEND WebKit_SOURCES
     blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp
     blackberry/WebCoreSupport/IconDatabaseClientBlackBerry.cpp
     blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp
+    blackberry/WebCoreSupport/NavigatorContentUtilsClientBlackBerry.cpp
     blackberry/WebCoreSupport/NetworkInfoClientBlackBerry.cpp
     blackberry/WebCoreSupport/NotificationClientBlackBerry.cpp
     blackberry/WebCoreSupport/PlatformStrategiesBlackBerry.cpp
-    blackberry/WebCoreSupport/NavigatorContentUtilsClientBlackBerry.cpp
-    blackberry/WebCoreSupport/SuggestionBoxHandler.cpp
     blackberry/WebCoreSupport/SuggestionBoxElement.cpp
+    blackberry/WebCoreSupport/SuggestionBoxHandler.cpp
     blackberry/WebCoreSupport/VibrationClientBlackBerry.cpp
+
     blackberry/WebKitSupport/AboutData.cpp
-    blackberry/WebKitSupport/BackingStoreTile.cpp
     blackberry/WebKitSupport/BackingStoreClient.cpp
+    blackberry/WebKitSupport/BackingStoreTile.cpp
     blackberry/WebKitSupport/BackingStoreVisualizationViewportAccessor.cpp
     blackberry/WebKitSupport/ColorPickerClient.cpp
+    blackberry/WebKitSupport/DOMSupport.cpp
     blackberry/WebKitSupport/DatePickerClient.cpp
     blackberry/WebKitSupport/DefaultTapHighlight.cpp
-    blackberry/WebKitSupport/DOMSupport.cpp
+    blackberry/WebKitSupport/FatFingers.cpp
     blackberry/WebKitSupport/FrameLayers.cpp
     blackberry/WebKitSupport/InPageSearchManager.cpp
-    blackberry/WebKitSupport/InputHandler.cpp
     blackberry/WebKitSupport/InRegionScrollableArea.cpp
+    blackberry/WebKitSupport/InputHandler.cpp
     blackberry/WebKitSupport/InspectorOverlayBlackBerry.cpp
     blackberry/WebKitSupport/NotificationManager.cpp
     blackberry/WebKitSupport/PagePopup.cpp
@@ -128,7 +131,6 @@ list(APPEND WebKit_SOURCES
     blackberry/WebKitSupport/SpellingHandler.cpp
     blackberry/WebKitSupport/SurfacePool.cpp
     blackberry/WebKitSupport/TouchEventHandler.cpp
-    blackberry/WebKitSupport/FatFingers.cpp
     blackberry/WebKitSupport/WebKitThreadViewportAccessor.cpp
 )
 
@@ -147,25 +149,28 @@ endif (ENABLE_WEBGL)
 if (NOT PUBLIC_BUILD)
     # DumpRenderTree sources
     list(APPEND WebKit_SOURCES
-        blackberry/WebKitSupport/DumpRenderTreeSupport.cpp
+        ${TOOLS_DIR}/DumpRenderTree/AccessibilityController.cpp
+        ${TOOLS_DIR}/DumpRenderTree/AccessibilityTextMarker.cpp
+        ${TOOLS_DIR}/DumpRenderTree/AccessibilityUIElement.cpp
+        ${TOOLS_DIR}/DumpRenderTree/CyclicRedundancyCheck.cpp
+        ${TOOLS_DIR}/DumpRenderTree/GCController.cpp
+        ${TOOLS_DIR}/DumpRenderTree/PixelDumpSupport.cpp
+        ${TOOLS_DIR}/DumpRenderTree/TestRunner.cpp
+        ${TOOLS_DIR}/DumpRenderTree/WorkQueue.cpp
+
         ${TOOLS_DIR}/DumpRenderTree/blackberry/AccessibilityControllerBlackBerry.cpp
         ${TOOLS_DIR}/DumpRenderTree/blackberry/AccessibilityUIElementBlackBerry.cpp
         ${TOOLS_DIR}/DumpRenderTree/blackberry/DumpRenderTree.cpp
         ${TOOLS_DIR}/DumpRenderTree/blackberry/EventSender.cpp
         ${TOOLS_DIR}/DumpRenderTree/blackberry/GCControllerBlackBerry.cpp
-        ${TOOLS_DIR}/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
-        ${TOOLS_DIR}/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp
         ${TOOLS_DIR}/DumpRenderTree/blackberry/PNGImageEncoder.cpp
+        ${TOOLS_DIR}/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp
+        ${TOOLS_DIR}/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
         ${TOOLS_DIR}/DumpRenderTree/blackberry/WorkQueueItemBlackBerry.cpp
-        ${TOOLS_DIR}/DumpRenderTree/AccessibilityController.cpp
-        ${TOOLS_DIR}/DumpRenderTree/AccessibilityUIElement.cpp
-        ${TOOLS_DIR}/DumpRenderTree/AccessibilityTextMarker.cpp
-        ${TOOLS_DIR}/DumpRenderTree/TestRunner.cpp
-        ${TOOLS_DIR}/DumpRenderTree/CyclicRedundancyCheck.cpp
-        ${TOOLS_DIR}/DumpRenderTree/PixelDumpSupport.cpp
-        ${TOOLS_DIR}/DumpRenderTree/WorkQueue.cpp
-        ${TOOLS_DIR}/DumpRenderTree/GCController.cpp
+
         ${WTF_DIR}/wtf/MD5.cpp
+
+        blackberry/WebKitSupport/DumpRenderTreeSupport.cpp
     )
 endif ()
 
@@ -180,7 +185,6 @@ list(APPEND WebKit_LIBRARIES
     ${INTL_LIBRARY}
     ${ITYPE_LIBRARY}
     ${JPEG_LIBRARY}
-    JavaScriptCore
     ${LEVELDB_LIBRARY}
     ${MMR_LIBRARY}
     ${M_LIBRARY}
@@ -192,6 +196,7 @@ list(APPEND WebKit_LIBRARIES
     ${XML2_LIBRARY}
     ${XSLT_LIBRARY}
     ${Z_LIBRARY}
+    JavaScriptCore
 )
 
 if (PROFILING)
@@ -208,8 +213,8 @@ if (WTF_USE_ACCELERATED_COMPOSITING)
         "${WEBCORE_DIR}/platform/graphics/gles2"
     )
     list(APPEND WebKit_LIBRARIES
-        ${GLESv2_LIBRARY}
         ${EGL_LIBRARY}
+        ${GLESv2_LIBRARY}
     )
 endif ()
 
index 9fdad60..6bc50e5 100644 (file)
@@ -105,8 +105,8 @@ list(APPEND WebKit_SOURCES
     efl/WebCoreSupport/ChromeClientEfl.cpp
     efl/WebCoreSupport/ColorChooserEfl.cpp
     efl/WebCoreSupport/ContextMenuClientEfl.cpp
-    efl/WebCoreSupport/DeviceOrientationClientEfl.cpp
     efl/WebCoreSupport/DeviceMotionClientEfl.cpp
+    efl/WebCoreSupport/DeviceOrientationClientEfl.cpp
     efl/WebCoreSupport/DragClientEfl.cpp
     efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
     efl/WebCoreSupport/EditorClientEfl.cpp
@@ -147,31 +147,31 @@ list(APPEND WebKit_SOURCES
     efl/ewk/ewk_view.cpp
     efl/ewk/ewk_view_single.cpp
     efl/ewk/ewk_view_tiled.cpp
-    efl/ewk/ewk_window_features.cpp
     efl/ewk/ewk_web_database.cpp
+    efl/ewk/ewk_window_features.cpp
 )
 
 list(APPEND WebKit_LIBRARIES
     ${CAIRO_LIBRARIES}
-    ${ECORE_LIBRARIES}
-    ${EDJE_LIBRARIES}
-    ${EINA_LIBRARIES}
+    ${CMAKE_DL_LIBS}
     ${ECORE_EVAS_LIBRARIES}
     ${ECORE_INPUT_LIBRARIES}
+    ${ECORE_LIBRARIES}
+    ${EDJE_LIBRARIES}
     ${EFREET_LIBRARIES}
+    ${EINA_LIBRARIES}
     ${EO_LIBRARIES}
     ${EVAS_LIBRARIES}
+    ${FONTCONFIG_LIBRARIES}
     ${FREETYPE_LIBRARIES}
+    ${GLIB_GOBJECT_LIBRARIES}
+    ${GLIB_LIBRARIES}
     ${HARFBUZZ_LIBRARIES}
-    ${LIBXML2_LIBRARIES}
-    ${SQLITE_LIBRARIES}
-    ${FONTCONFIG_LIBRARIES}
-    ${PNG_LIBRARIES}
     ${JPEG_LIBRARIES}
-    ${CMAKE_DL_LIBS}
-    ${GLIB_LIBRARIES}
-    ${GLIB_GOBJECT_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
+    ${LIBXML2_LIBRARIES}
+    ${PNG_LIBRARIES}
+    ${SQLITE_LIBRARIES}
 )
 
 if (ENABLE_ECORE_X)
@@ -210,8 +210,8 @@ set(EWebKit_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_security_policy.h
     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_settings.h
     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_view.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_window_features.h
     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_web_database.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_window_features.h
 )
 
 install(FILES ${EWebKit_HEADERS}
@@ -220,14 +220,14 @@ install(FILES ${EWebKit_HEADERS}
 include_directories(${THIRDPARTY_DIR}/gtest/include)
 
 set(EWKUnitTests_LIBRARIES
-    WTF
+    ${ECORE_EVAS_LIBRARIES}
+    ${ECORE_LIBRARIES}
+    ${EDJE_LIBRARIES}
+    ${EVAS_LIBRARIES}
     JavaScriptCore
+    WTF
     WebCore
     WebKit
-    ${ECORE_LIBRARIES}
-    ${ECORE_EVAS_LIBRARIES}
-    ${EVAS_LIBRARIES}
-    ${EDJE_LIBRARIES}
     gtest
 )
 
@@ -245,8 +245,8 @@ set(EWKUnitTests_INCLUDE_DIRECTORIES
 
 list(APPEND EWKUnitTests_INCLUDE_DIRECTORIES "${WTF_DIR}/wtf/gobject")
 list(APPEND EWKUnitTests_LIBRARIES
-    ${GLIB_LIBRARIES}
     ${GLIB_GTHREAD_LIBRARIES}
+    ${GLIB_LIBRARIES}
 )
 
 set(DEFAULT_TEST_PAGE_DIR ${CMAKE_SOURCE_DIR}/Source/WebKit/efl/tests/resources)
@@ -268,8 +268,8 @@ set(WEBKIT_EFL_TEST_DIR "${WEBKIT_DIR}/efl/tests/")
 set(EWKUnitTests_BINARIES
     test_ewk_contextmenu
     test_ewk_frame
-    test_ewk_view
     test_ewk_setting
+    test_ewk_view
 )
 
 if (ENABLE_API_TESTS)
index f9c3ec8..694c01b 100644 (file)
@@ -11,8 +11,8 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
 )
 
 list(APPEND WebKit_SOURCES
-    wince/WebView.h
     wince/WebView.cpp
+    wince/WebView.h
 
     wince/WebCoreSupport/ChromeClientWinCE.cpp
     wince/WebCoreSupport/ContextMenuClientWinCE.cpp