Title: [156266] trunk/Source/WebKit
- Revision
- 156266
- Author
- par...@webkit.org
- Date
- 2013-09-23 01:09:08 -0700 (Mon, 23 Sep 2013)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (156265 => 156266)
--- trunk/Source/WebKit/ChangeLog 2013-09-23 08:07:44 UTC (rev 156265)
+++ trunk/Source/WebKit/ChangeLog 2013-09-23 08:09:08 UTC (rev 156266)
@@ -1,3 +1,16 @@
+2013-09-23 Patrick Gansterer <par...@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 <bfulg...@apple.com>
[Windows] Unreviewed build fix after r156216.
Modified: trunk/Source/WebKit/PlatformBlackBerry.cmake (156265 => 156266)
--- trunk/Source/WebKit/PlatformBlackBerry.cmake 2013-09-23 08:07:44 UTC (rev 156265)
+++ trunk/Source/WebKit/PlatformBlackBerry.cmake 2013-09-23 08:09:08 UTC (rev 156266)
@@ -70,6 +70,7 @@
blackberry/Api/BackingStore.cpp
blackberry/Api/BlackBerryGlobal.cpp
blackberry/Api/InRegionScroller.cpp
+ blackberry/Api/_javascript_Variant.cpp
blackberry/Api/WebAnimation.cpp
blackberry/Api/WebCookieJar.cpp
blackberry/Api/WebKitMIMETypeConverter.cpp
@@ -81,7 +82,7 @@
blackberry/Api/WebPageGroupLoadDeferrer.cpp
blackberry/Api/WebSettings.cpp
blackberry/Api/WebViewportArguments.cpp
- blackberry/Api/_javascript_Variant.cpp
+
blackberry/WebCoreSupport/AutofillManager.cpp
blackberry/WebCoreSupport/BackForwardListBlackBerry.cpp
blackberry/WebCoreSupport/CacheClientBlackBerry.cpp
@@ -97,25 +98,27 @@
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/SuggestionBoxElement.cpp
blackberry/WebCoreSupport/SuggestionBoxHandler.cpp
- blackberry/WebCoreSupport/SuggestionBoxElement.cpp
blackberry/WebCoreSupport/VibrationClientBlackBerry.cpp
+
blackberry/WebKitSupport/AboutData.cpp
+ blackberry/WebKitSupport/BackingStoreClient.cpp
blackberry/WebKitSupport/BackingStoreTile.cpp
- blackberry/WebKitSupport/BackingStoreClient.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/InRegionScrollableArea.cpp
blackberry/WebKitSupport/InputHandler.cpp
- blackberry/WebKitSupport/InRegionScrollableArea.cpp
blackberry/WebKitSupport/InspectorOverlayBlackBerry.cpp
blackberry/WebKitSupport/NotificationManager.cpp
blackberry/WebKitSupport/PagePopup.cpp
@@ -128,7 +131,6 @@
blackberry/WebKitSupport/SpellingHandler.cpp
blackberry/WebKitSupport/SurfacePool.cpp
blackberry/WebKitSupport/TouchEventHandler.cpp
- blackberry/WebKitSupport/FatFingers.cpp
blackberry/WebKitSupport/WebKitThreadViewportAccessor.cpp
)
@@ -147,25 +149,28 @@
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/PNGImageEncoder.cpp
+ ${TOOLS_DIR}/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp
${TOOLS_DIR}/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
- ${TOOLS_DIR}/DumpRenderTree/blackberry/PixelDumpSupportBlackBerry.cpp
- ${TOOLS_DIR}/DumpRenderTree/blackberry/PNGImageEncoder.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 @@
${INTL_LIBRARY}
${ITYPE_LIBRARY}
${JPEG_LIBRARY}
- _javascript_Core
${LEVELDB_LIBRARY}
${MMR_LIBRARY}
${M_LIBRARY}
@@ -192,6 +196,7 @@
${XML2_LIBRARY}
${XSLT_LIBRARY}
${Z_LIBRARY}
+ _javascript_Core
)
if (PROFILING)
@@ -208,8 +213,8 @@
"${WEBCORE_DIR}/platform/graphics/gles2"
)
list(APPEND WebKit_LIBRARIES
+ ${EGL_LIBRARY}
${GLESv2_LIBRARY}
- ${EGL_LIBRARY}
)
endif ()
Modified: trunk/Source/WebKit/PlatformEfl.cmake (156265 => 156266)
--- trunk/Source/WebKit/PlatformEfl.cmake 2013-09-23 08:07:44 UTC (rev 156265)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2013-09-23 08:09:08 UTC (rev 156266)
@@ -105,8 +105,8 @@
efl/WebCoreSupport/ChromeClientEfl.cpp
efl/WebCoreSupport/ColorChooserEfl.cpp
efl/WebCoreSupport/ContextMenuClientEfl.cpp
+ efl/WebCoreSupport/DeviceMotionClientEfl.cpp
efl/WebCoreSupport/DeviceOrientationClientEfl.cpp
- efl/WebCoreSupport/DeviceMotionClientEfl.cpp
efl/WebCoreSupport/DragClientEfl.cpp
efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
efl/WebCoreSupport/EditorClientEfl.cpp
@@ -147,31 +147,31 @@
efl/ewk/ewk_view.cpp
efl/ewk/ewk_view_single.cpp
efl/ewk/ewk_view_tiled.cpp
+ efl/ewk/ewk_web_database.cpp
efl/ewk/ewk_window_features.cpp
- efl/ewk/ewk_web_database.cpp
)
list(APPEND WebKit_LIBRARIES
${CAIRO_LIBRARIES}
+ ${CMAKE_DL_LIBS}
+ ${ECORE_EVAS_LIBRARIES}
+ ${ECORE_INPUT_LIBRARIES}
${ECORE_LIBRARIES}
${EDJE_LIBRARIES}
+ ${EFREET_LIBRARIES}
${EINA_LIBRARIES}
- ${ECORE_EVAS_LIBRARIES}
- ${ECORE_INPUT_LIBRARIES}
- ${EFREET_LIBRARIES}
${EO_LIBRARIES}
${EVAS_LIBRARIES}
+ ${FONTCONFIG_LIBRARIES}
${FREETYPE_LIBRARIES}
+ ${GLIB_GOBJECT_LIBRARIES}
+ ${GLIB_LIBRARIES}
${HARFBUZZ_LIBRARIES}
+ ${JPEG_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
${LIBXML2_LIBRARIES}
+ ${PNG_LIBRARIES}
${SQLITE_LIBRARIES}
- ${FONTCONFIG_LIBRARIES}
- ${PNG_LIBRARIES}
- ${JPEG_LIBRARIES}
- ${CMAKE_DL_LIBS}
- ${GLIB_LIBRARIES}
- ${GLIB_GOBJECT_LIBRARIES}
- ${LIBSOUP_LIBRARIES}
)
if (ENABLE_ECORE_X)
@@ -210,8 +210,8 @@
${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_web_database.h
${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_window_features.h
- ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_web_database.h
)
install(FILES ${EWebKit_HEADERS}
@@ -220,14 +220,14 @@
include_directories(${THIRDPARTY_DIR}/gtest/include)
set(EWKUnitTests_LIBRARIES
+ ${ECORE_EVAS_LIBRARIES}
+ ${ECORE_LIBRARIES}
+ ${EDJE_LIBRARIES}
+ ${EVAS_LIBRARIES}
+ _javascript_Core
WTF
- _javascript_Core
WebCore
WebKit
- ${ECORE_LIBRARIES}
- ${ECORE_EVAS_LIBRARIES}
- ${EVAS_LIBRARIES}
- ${EDJE_LIBRARIES}
gtest
)
@@ -245,8 +245,8 @@
list(APPEND EWKUnitTests_INCLUDE_DIRECTORIES "${WTF_DIR}/wtf/gobject")
list(APPEND EWKUnitTests_LIBRARIES
+ ${GLIB_GTHREAD_LIBRARIES}
${GLIB_LIBRARIES}
- ${GLIB_GTHREAD_LIBRARIES}
)
set(DEFAULT_TEST_PAGE_DIR ${CMAKE_SOURCE_DIR}/Source/WebKit/efl/tests/resources)
@@ -268,8 +268,8 @@
set(EWKUnitTests_BINARIES
test_ewk_contextmenu
test_ewk_frame
+ test_ewk_setting
test_ewk_view
- test_ewk_setting
)
if (ENABLE_API_TESTS)
Modified: trunk/Source/WebKit/PlatformWinCE.cmake (156265 => 156266)
--- trunk/Source/WebKit/PlatformWinCE.cmake 2013-09-23 08:07:44 UTC (rev 156265)
+++ trunk/Source/WebKit/PlatformWinCE.cmake 2013-09-23 08:09:08 UTC (rev 156266)
@@ -11,8 +11,8 @@
)
list(APPEND WebKit_SOURCES
+ wince/WebView.cpp
wince/WebView.h
- wince/WebView.cpp
wince/WebCoreSupport/ChromeClientWinCE.cpp
wince/WebCoreSupport/ContextMenuClientWinCE.cpp
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
