diff options
Diffstat (limited to 'Source/WebKit/PlatformBlackBerry.cmake')
| -rw-r--r-- | Source/WebKit/PlatformBlackBerry.cmake | 126 |
1 files changed, 89 insertions, 37 deletions
diff --git a/Source/WebKit/PlatformBlackBerry.cmake b/Source/WebKit/PlatformBlackBerry.cmake index 7fdb7eca7..77ae24b45 100644 --- a/Source/WebKit/PlatformBlackBerry.cmake +++ b/Source/WebKit/PlatformBlackBerry.cmake @@ -4,30 +4,50 @@ LIST(INSERT WebKit_INCLUDE_DIRECTORIES 0 ) LIST(APPEND WebKit_INCLUDE_DIRECTORIES - "${JAVASCRIPTCORE_DIR}/wtf/text" + "${JAVASCRIPTCORE_DIR}/dfg" "${WEBCORE_DIR}/bindings/cpp" + "${WEBCORE_DIR}/fileapi" "${WEBCORE_DIR}/history/blackberry" - "${WEBCORE_DIR}/html/canvas" "${WEBCORE_DIR}/html/parser" # For HTMLParserIdioms.h "${WEBCORE_DIR}/loader/appcache" "${WEBCORE_DIR}/platform/blackberry" + "${WEBCORE_DIR}/platform/graphics/gpu" "${WEBCORE_DIR}/platform/graphics/blackberry" - "${WEBCORE_DIR}/platform/graphics/blackberry/skia" - "${WEBCORE_DIR}/platform/graphics/skia" "${WEBCORE_DIR}/platform/network/blackberry" + "${WEBCORE_DIR}/testing/js" + "${WEBCORE_DIR}/Modules/filesystem" "${WEBCORE_DIR}/Modules/geolocation" - "${WEBCORE_DIR}/Modules/notifications" + "${WEBCORE_DIR}/Modules/indexeddb" + "${WEBCORE_DIR}/Modules/networkinfo" "${WEBCORE_DIR}/Modules/vibration" "${WEBCORE_DIR}/Modules/websockets" "${WEBKIT_DIR}/blackberry/Api" "${WEBKIT_DIR}/blackberry/WebCoreSupport" "${WEBKIT_DIR}/blackberry/WebKitSupport" "${CMAKE_SOURCE_DIR}/Source" # For JavaScriptCore API headers + "${CMAKE_SOURCE_DIR}" ) + +IF (ENABLE_NOTIFICATIONS) + LIST(APPEND WebKit_INCLUDE_DIRECTORIES + "${WEBCORE_DIR}/Modules/notifications" + ) +ENDIF () +IF (WTF_USE_SKIA) + LIST(APPEND WebKit_INCLUDE_DIRECTORIES + "${WEBCORE_DIR}/platform/graphics/chromium" + "${WEBCORE_DIR}/platform/graphics/blackberry/skia" + "${WEBCORE_DIR}/platform/graphics/skia" + ) +ELSE () + LIST(APPEND WebKit_INCLUDE_DIRECTORIES + "${WEBCORE_DIR}/platform/image-encoders" + ) +ENDIF () + IF (NOT PUBLIC_BUILD) LIST(APPEND WebKit_INCLUDE_DIRECTORIES # needed for DRT for now - "${JAVASCRIPTCORE_DIR}/wtf" "${WEBCORE_DIR}/platform/mock" "${WEBCORE_DIR}/svg/animation" "${WEBCORE_DIR}/workers" @@ -42,6 +62,12 @@ IF (ENABLE_BATTERY_STATUS) LIST(APPEND WebKit_SOURCES blackberry/WebCoreSupport/BatteryClientBlackBerry.cpp) ENDIF () +IF (ENABLE_NAVIGATOR_CONTENT_UTILS) + LIST(APPEND WebKit_INCLUDE_DIRECTORIES + "${WEBCORE_DIR}/Modules/navigatorcontentutils" + ) +ENDIF () + IF (ENABLE_MEDIA_STREAM) LIST(APPEND WebKit_INCLUDE_DIRECTORIES "${WEBCORE_DIR}/Modules/mediastream" @@ -88,28 +114,32 @@ LIST(APPEND WebKit_SOURCES blackberry/WebCoreSupport/IconDatabaseClientBlackBerry.cpp blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp blackberry/WebCoreSupport/JavaScriptDebuggerBlackBerry.cpp + blackberry/WebCoreSupport/NetworkInfoClientBlackBerry.cpp blackberry/WebCoreSupport/NotificationPresenterImpl.cpp - blackberry/WebCoreSupport/VibrationClientBlackBerry.cpp blackberry/WebCoreSupport/PagePopupBlackBerry.cpp + blackberry/WebCoreSupport/NavigatorContentUtilsClientBlackBerry.cpp blackberry/WebCoreSupport/SelectPopupClient.cpp + blackberry/WebCoreSupport/VibrationClientBlackBerry.cpp blackberry/WebCoreSupport/DatePickerClient.cpp blackberry/WebCoreSupport/ColorPickerClient.cpp blackberry/WebKitSupport/AboutData.cpp blackberry/WebKitSupport/BackingStoreTile.cpp blackberry/WebKitSupport/BackingStoreClient.cpp + blackberry/WebKitSupport/BackingStoreVisualizationViewportAccessor.cpp blackberry/WebKitSupport/DefaultTapHighlight.cpp blackberry/WebKitSupport/DOMSupport.cpp blackberry/WebKitSupport/FrameLayers.cpp blackberry/WebKitSupport/InPageSearchManager.cpp blackberry/WebKitSupport/InputHandler.cpp blackberry/WebKitSupport/InRegionScrollableArea.cpp - blackberry/WebKitSupport/InspectorOverlay.cpp + blackberry/WebKitSupport/InspectorOverlayBlackBerry.cpp blackberry/WebKitSupport/RenderQueue.cpp blackberry/WebKitSupport/SelectionHandler.cpp blackberry/WebKitSupport/SelectionOverlay.cpp blackberry/WebKitSupport/SurfacePool.cpp blackberry/WebKitSupport/TouchEventHandler.cpp blackberry/WebKitSupport/FatFingers.cpp + blackberry/WebKitSupport/WebKitThreadViewportAccessor.cpp ) IF (ENABLE_WEBGL) @@ -145,6 +175,7 @@ IF (NOT PUBLIC_BUILD) ${TOOLS_DIR}/DumpRenderTree/PixelDumpSupport.cpp ${TOOLS_DIR}/DumpRenderTree/WorkQueue.cpp ${TOOLS_DIR}/DumpRenderTree/GCController.cpp + ${WTF_DIR}/wtf/MD5.cpp ) ENDIF () @@ -153,28 +184,38 @@ SET(WebKit_LINK_FLAGS ${BLACKBERRY_LINK_FLAGS}) LIST(APPEND WebKit_LIBRARIES ${CURL_LIBRARY} ${FONTCONFIG_LIBRARY} - ${FREETYPE_LIBRARY} - ${HARFBUZZ_LIBRARY} ${ICUData_LIBRARY} ${ICUI18N_LIBRARY} ${ICUUC_LIBRARY} ${INTL_LIBRARY} ${JPEG_LIBRARY} ${JavaScriptCore_LIBRARY_NAME} + ${LEVELDB_LIBRARY} ${MMR_LIBRARY} ${M_LIBRARY} ${OTS_LIBRARY} ${PNG_LIBRARY} ${SQLITE3_LIBRARY} - ${Skia_LIBRARY} - ${Skia_QNX_LIBRARY} - ${UUID_LIBRARY} ${WebKitPlatform_LIBRARY} ${XML2_LIBRARY} ${XSLT_LIBRARY} ${Z_LIBRARY} ) +IF (WTF_USE_SKIA) + LIST(APPEND WebKit_LIBRARIES + ${FREETYPE_LIBRARY} + ${HARFBUZZ_LIBRARY} + ${Skia_LIBRARY} + ${Skia_QNX_LIBRARY} + ) +ELSE () + LIST(APPEND WebKit_LIBRARIES + ${ITYPE_LIBRARY} + ${WTLE_LIBRARY} + ) +ENDIF () + IF (PROFILING) LIST(APPEND WebKit_LIBRARIES ${PROFILING_LIBRARY} @@ -196,35 +237,43 @@ ENDIF () FILE(GLOB BBWebKit_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/blackberry/Api/*.h") -INSTALL(FILES ${BBWebKit_HEADERS} DESTINATION usr/include/browser/webkit) +INSTALL(FILES ${BBWebKit_HEADERS} + DESTINATION ../../usr/include/browser/webkit) IF (NOT PUBLIC_BUILD) INSTALL(FILES ${TOOLS_DIR}/DumpRenderTree/blackberry/DumpRenderTreeBlackBerry.h - DESTINATION usr/include/browser/webkit) + DESTINATION ../../usr/include/browser/webkit) +ENDIF () + +IF (ENABLE_VIDEO_TRACK) + LIST(APPEND WebKit_INCLUDE_DIRECTORIES + "${WEBCORE_DIR}/html/track" + ) ENDIF () -SET(WebKit_INSTALL_DIR "${CMAKE_SYSTEM_PROCESSOR}/usr/lib/torch-webkit") - -# Get the JavaScript file names from inspector.html, in order to keep the JavaScript files -# generated in the correct order, and to keep the file names in-sync with the changes of inspector.html -FILE (STRINGS ${WEBCORE_DIR}/inspector/front-end/inspector.html SCRIPT_TAGS REGEX "<script.* src=\".*js\".*></script>") -FOREACH (_line IN LISTS SCRIPT_TAGS) - STRING (STRIP ${_line} _stripped_line) - STRING (REGEX REPLACE "<script.* src=\"(.*\\.js)\".*></script>" "\\1" _js_file ${_stripped_line}) - STRING (COMPARE EQUAL ${_js_file} "InspectorBackendCommands.js" _comp_result) - IF ( ${_comp_result} ) - # InspectorBackendCommands.js was generated with the build, should get it from DERIVED_SOURCES_WEBCORE_DIR. - SET (_js_file "${DERIVED_SOURCES_WEBCORE_DIR}/${_js_file}") - ELSE () - SET (_js_file "${WEBCORE_DIR}/inspector/front-end/${_js_file}") - ENDIF () - SET (JS_FILES ${JS_FILES} ${_js_file}) -ENDFOREACH () -SET (JS_FILES ${JS_FILES} ${WEBKIT_DIR}/blackberry/WebCoreSupport/inspectorBB.js) +INSTALL(DIRECTORY ${WEBCORE_DIR}/inspector/front-end/ + DESTINATION ../../usr/share/webkit/inspector/ + FILES_MATCHING PATTERN "*.js") +INSTALL(DIRECTORY ${WEBCORE_DIR}/inspector/front-end/ + DESTINATION ../../usr/share/webkit/inspector/ + FILES_MATCHING PATTERN "*.css") +INSTALL(DIRECTORY ${WEBCORE_DIR}/inspector/front-end/ + DESTINATION ../../usr/share/webkit/inspector/ + FILES_MATCHING PATTERN "*.png") +INSTALL(DIRECTORY ${WEBCORE_DIR}/inspector/front-end/ + DESTINATION ../../usr/share/webkit/inspector/ + FILES_MATCHING PATTERN "*.jpg") +INSTALL(DIRECTORY ${WEBCORE_DIR}/inspector/front-end/ + DESTINATION ../../usr/share/webkit/inspector/ + FILES_MATCHING PATTERN "*.gif") +INSTALL(FILES ${DERIVED_SOURCES_WEBCORE_DIR}/inspectorBB.html + ${WEBKIT_DIR}/blackberry/WebCoreSupport/inspectorBB.js + ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendCommands.js + DESTINATION ../../usr/share/webkit/inspector/) ADD_CUSTOM_TARGET ( inspector ALL - COMMAND cat ${JS_FILES} > ${DERIVED_SOURCES_WEBCORE_DIR}/javascript.js + command cp ${WEBCORE_DIR}/inspector/front-end/inspector.html ${DERIVED_SOURCES_WEBCORE_DIR}/inspectorBB.html && echo '<script src="inspectorBB.js"></script>' >> ${DERIVED_SOURCES_WEBCORE_DIR}/inspectorBB.html DEPENDS ${WebCore_LIBRARY_NAME} COMMENT "Web Inspector resources building..." ) @@ -232,19 +281,22 @@ ADD_CUSTOM_TARGET ( # Generate contents for AboutData.cpp ADD_CUSTOM_COMMAND( OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataHaveFeatures.cpp - MAIN_DEPENDENCY ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataHaveFeatures.in ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl + MAIN_DEPENDENCY ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataHaveFeatures.in + DEPENDS ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataHaveFeatures.in ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl HAVE ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataHaveFeatures.in ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataHaveFeatures.cpp ) ADD_CUSTOM_COMMAND( OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataEnableFeatures.cpp - MAIN_DEPENDENCY ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataEnableFeatures.in ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl + MAIN_DEPENDENCY ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataEnableFeatures.in + DEPENDS ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataEnableFeatures.in ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl ENABLE ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataEnableFeatures.in ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataEnableFeatures.cpp ) ADD_CUSTOM_COMMAND( OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataUseFeatures.cpp - MAIN_DEPENDENCY ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataUseFeatures.in ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl + MAIN_DEPENDENCY ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataUseFeatures.in + DEPENDS ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataUseFeatures.in ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/blackberry/WebCoreSupport/generateAboutDataFeatures.pl USE ${WEBKIT_DIR}/blackberry/WebCoreSupport/AboutDataUseFeatures.in ${DERIVED_SOURCES_WEBCORE_DIR}/AboutDataUseFeatures.cpp ) |