Diff
Modified: trunk/ChangeLog (215605 => 215606)
--- trunk/ChangeLog 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/ChangeLog 2017-04-21 06:08:13 UTC (rev 215606)
@@ -1,3 +1,18 @@
+2017-04-20 Konstantin Tokarev <[email protected]>
+
+ [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=171071
+
+ Reviewed by Michael Catanzaro.
+
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
+ build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
+ be available for all ports.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/WebKitFS.cmake:
+ * Source/cmake/WebKitMacros.cmake:
+
2017-04-17 Yusuke Suzuki <[email protected]>
[JSCOnly] Fix build failures in macOS
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (215605 => 215606)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2017-04-21 06:08:13 UTC (rev 215606)
@@ -38,7 +38,7 @@
"${_javascript_CORE_DIR}/wasm"
"${_javascript_CORE_DIR}/wasm/js"
"${_javascript_CORE_DIR}/yarr"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
+ "${FORWARDING_HEADERS_DIR}"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
)
@@ -1070,7 +1070,7 @@
)
# Force _javascript_Core to run scripts from the same staging path as WebCore.
-set(_javascript_Core_SCRIPTS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/Scripts")
+set(_javascript_Core_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/_javascript_Core/Scripts")
file(MAKE_DIRECTORY ${_javascript_Core_SCRIPTS_DIR})
Modified: trunk/Source/_javascript_Core/ChangeLog (215605 => 215606)
--- trunk/Source/_javascript_Core/ChangeLog 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-04-21 06:08:13 UTC (rev 215606)
@@ -1,5 +1,19 @@
2017-04-20 Konstantin Tokarev <[email protected]>
+ [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=171071
+
+ Reviewed by Michael Catanzaro.
+
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
+ build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
+ be available for all ports.
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+
+2017-04-20 Konstantin Tokarev <[email protected]>
+
Remove unused lamda captures
https://bugs.webkit.org/show_bug.cgi?id=171098
Modified: trunk/Source/_javascript_Core/PlatformWin.cmake (215605 => 215606)
--- trunk/Source/_javascript_Core/PlatformWin.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/_javascript_Core/PlatformWin.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -29,16 +29,16 @@
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core)
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/_javascript_Core)
set(_javascript_Core_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core/preBuild.cmd")
file(REMOVE "${_javascript_Core_PRE_BUILD_COMMAND}")
foreach (_directory ${_javascript_Core_FORWARDING_HEADERS_DIRECTORIES})
- file(APPEND "${_javascript_Core_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${_javascript_CORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core\" >nul 2>nul\n")
+ file(APPEND "${_javascript_Core_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${_javascript_CORE_DIR}/${_directory}/*.h\" \"${FORWARDING_HEADERS_DIR}/_javascript_Core\" >nul 2>nul\n")
endforeach ()
set(_javascript_Core_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core/postBuild.cmd")
-file(WRITE "${_javascript_Core_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/_javascript_Core/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core\" >nul 2>nul\n")
-file(APPEND "${_javascript_Core_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/_javascript_Core/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core\" >nul 2>nul\n")
+file(WRITE "${_javascript_Core_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/_javascript_Core/*.h\" \"${FORWARDING_HEADERS_DIR}/_javascript_Core\" >nul 2>nul\n")
+file(APPEND "${_javascript_Core_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/_javascript_Core/inspector/*.h\" \"${FORWARDING_HEADERS_DIR}/_javascript_Core\" >nul 2>nul\n")
set(_javascript_Core_OUTPUT_NAME _javascript_Core${DEBUG_SUFFIX})
Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (215605 => 215606)
--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2017-04-21 06:08:13 UTC (rev 215606)
@@ -259,10 +259,10 @@
target_link_libraries(libGLESv2 ${ANGLEGLESv2_LIBRARIES})
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES2)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLSLANG)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr)
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/egl)
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES2)
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLSLANG)
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/khr)
file(GLOB _files_ANGLE "${THIRDPARTY_DIR}/ANGLE/ANGLE/*.h")
file(GLOB _files_egl "${THIRDPARTY_DIR}/ANGLE/include/egl/*.h")
file(GLOB _files_GLES2 "${THIRDPARTY_DIR}/ANGLE/include/GLES2/*.h")
@@ -270,22 +270,22 @@
file(GLOB _files_GLSLANG "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG/*.h")
file(GLOB _files_khr "${THIRDPARTY_DIR}/ANGLE/include/khr/*.h")
foreach (_file ${_files_ANGLE})
- file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/)
+ file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/)
endforeach ()
foreach (_file ${_files_egl})
- file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl)
+ file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/egl)
endforeach ()
foreach (_file ${_files_GLES2})
- file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES2)
+ file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES2)
endforeach ()
foreach (_file ${_files_GLES3})
- file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES3)
+ file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES3)
endforeach ()
foreach (_file ${_files_GLSLANG})
- file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLSLANG)
+ file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLSLANG)
endforeach ()
foreach (_file ${_files_khr})
- file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr)
+ file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/khr)
endforeach ()
set_property(DIRECTORY . PROPERTY FOLDER "ANGLE")
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (215605 => 215606)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2017-04-21 06:08:13 UTC (rev 215606)
@@ -1,3 +1,16 @@
+2017-04-20 Konstantin Tokarev <[email protected]>
+
+ [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=171071
+
+ Reviewed by Michael Catanzaro.
+
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
+ build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
+ be available for all ports.
+
+ * CMakeLists.txt:
+
2017-04-20 Fujii Hironori <[email protected]>
[WinCairo] Fix build break after updating ANGLE
Modified: trunk/Source/WebCore/CMakeLists.txt (215605 => 215606)
--- trunk/Source/WebCore/CMakeLists.txt 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-04-21 06:08:13 UTC (rev 215606)
@@ -842,8 +842,8 @@
set(_javascript_Core_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/_javascript_Core/Scripts")
set(ANGLE_FORWARDING_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private/ANGLE")
else ()
- set(_javascript_Core_SCRIPTS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/Scripts")
- set(ANGLE_FORWARDING_HEADERS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE")
+ set(_javascript_Core_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/_javascript_Core/Scripts")
+ set(ANGLE_FORWARDING_HEADERS_DIR "${FORWARDING_HEADERS_DIR}/ANGLE")
endif ()
set(WebCore_SOURCES
Modified: trunk/Source/WebCore/ChangeLog (215605 => 215606)
--- trunk/Source/WebCore/ChangeLog 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebCore/ChangeLog 2017-04-21 06:08:13 UTC (rev 215606)
@@ -1,3 +1,19 @@
+2017-04-20 Konstantin Tokarev <[email protected]>
+
+ [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=171071
+
+ Reviewed by Michael Catanzaro.
+
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
+ build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
+ be available for all ports.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+ * PlatformWinCairo.cmake:
+
2017-04-20 Commit Queue <[email protected]>
Unreviewed, rolling out r215597.
Modified: trunk/Source/WebCore/PlatformMac.cmake (215605 => 215606)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -69,7 +69,7 @@
endif ()
list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core"
"${THIRDPARTY_DIR}/ANGLE"
"${THIRDPARTY_DIR}/ANGLE/include/KHR"
"${WEBCORE_DIR}/accessibility/mac"
Modified: trunk/Source/WebCore/PlatformWin.cmake (215605 => 215606)
--- trunk/Source/WebCore/PlatformWin.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebCore/PlatformWin.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -4,28 +4,28 @@
"${WEBCORE_DIR}/ForwardingHeaders"
"${CMAKE_BINARY_DIR}/../include/private"
"${CMAKE_BINARY_DIR}/../include/private/_javascript_Core"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/KHR"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/ForwardingHeaders"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/API"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/assembler"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/builtins"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/bytecode"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/bytecompiler"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/dfg"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/disassembler"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/domjit"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/heap"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/debugger"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/interpreter"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/jit"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/llint"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/parser"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/profiler"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/runtime"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/yarr"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF"
+ "${FORWARDING_HEADERS_DIR}/ANGLE"
+ "${FORWARDING_HEADERS_DIR}/ANGLE/include/KHR"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/ForwardingHeaders"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/API"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/assembler"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/builtins"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/bytecode"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/bytecompiler"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/dfg"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/disassembler"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/domjit"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/heap"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/debugger"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/interpreter"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/jit"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/llint"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/parser"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/profiler"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/runtime"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core/yarr"
+ "${FORWARDING_HEADERS_DIR}/WTF"
"${WEBCORE_DIR}/accessibility/win"
"${WEBCORE_DIR}/page/win"
"${WEBCORE_DIR}/platform/cf"
@@ -302,16 +302,16 @@
)
endif ()
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore)
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebCore)
set(WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/preBuild.cmd")
-file(WRITE "${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
+file(WRITE "${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${FORWARDING_HEADERS_DIR}/WebCore\" >nul 2>nul\n")
foreach (_directory ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
- file(APPEND "${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
+ file(APPEND "${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${FORWARDING_HEADERS_DIR}/WebCore\" >nul 2>nul\n")
endforeach ()
set(WebCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/postBuild.cmd")
-file(WRITE "${WebCore_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
+file(WRITE "${WebCore_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${FORWARDING_HEADERS_DIR}/WebCore\" >nul 2>nul\n")
set(WebCore_OUTPUT_NAME
WebCore${DEBUG_SUFFIX}
Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (215605 => 215606)
--- trunk/Source/WebCore/PlatformWinCairo.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -3,7 +3,7 @@
list(APPEND WebCore_INCLUDE_DIRECTORIES
${CAIRO_INCLUDE_DIRS}
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core"
"${DirectX_INCLUDE_DIRS}"
"${WEBKIT_LIBRARIES_DIR}/include"
"${WEBKIT_LIBRARIES_DIR}/include/SQLite"
Modified: trunk/Source/WebKit/CMakeLists.txt (215605 => 215606)
--- trunk/Source/WebKit/CMakeLists.txt 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebKit/CMakeLists.txt 2017-04-21 06:08:13 UTC (rev 215606)
@@ -20,9 +20,9 @@
"${CMAKE_BINARY_DIR}"
"${WEBKIT_DIR}/Storage"
"${WEBKIT_DIR}/WebCoreSupport"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
+ "${FORWARDING_HEADERS_DIR}/_javascript_Core"
+ "${FORWARDING_HEADERS_DIR}/WebCore"
+ "${FORWARDING_HEADERS_DIR}/WebKitLegacy"
)
set(WebKit_SYSTEM_INCLUDE_DIRECTORIES
Modified: trunk/Source/WebKit/ChangeLog (215605 => 215606)
--- trunk/Source/WebKit/ChangeLog 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebKit/ChangeLog 2017-04-21 06:08:13 UTC (rev 215606)
@@ -1,3 +1,18 @@
+2017-04-20 Konstantin Tokarev <[email protected]>
+
+ [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=171071
+
+ Reviewed by Michael Catanzaro.
+
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
+ build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
+ be available for all ports.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+
2017-04-12 Brady Eidson <[email protected]>
QuotaExceededError when saving to localStorage in private mode.
Modified: trunk/Source/WebKit/PlatformMac.cmake (215605 => 215606)
--- trunk/Source/WebKit/PlatformMac.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebKit/PlatformMac.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -441,7 +441,7 @@
)
WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
-WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy)
+WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${FORWARDING_HEADERS_DIR}/WebKitLegacy)
# FIXME: Forwarding headers should be copies of actual headers.
file(GLOB ObjCHeaders ${WEBCORE_DIR}/plugins/*.h)
@@ -451,8 +451,8 @@
)
foreach (_file ${ObjCHeaders})
get_filename_component(_name ${_file} NAME)
- if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name})
- file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
+ if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKitLegacy/${_name})
+ file(WRITE ${FORWARDING_HEADERS_DIR}/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
endif ()
endforeach ()
Modified: trunk/Source/WebKit/PlatformWin.cmake (215605 => 215606)
--- trunk/Source/WebKit/PlatformWin.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebKit/PlatformWin.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -57,10 +57,10 @@
"${WEBKIT_DIR}/win/WebCoreSupport"
"${DERIVED_SOURCES_WEBKIT_DIR}/include"
"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr"
+ "${FORWARDING_HEADERS_DIR}/ANGLE"
+ "${FORWARDING_HEADERS_DIR}/ANGLE/include"
+ "${FORWARDING_HEADERS_DIR}/ANGLE/include/egl"
+ "${FORWARDING_HEADERS_DIR}/ANGLE/include/khr"
"${DERIVED_SOURCES_DIR}/WebKit"
)
@@ -478,12 +478,12 @@
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces)
set(WebKitGUID_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/preBuild.cmd")
-file(WRITE "${WebKitGUID_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n")
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit)
+file(WRITE "${WebKitGUID_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${FORWARDING_HEADERS_DIR}/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${FORWARDING_HEADERS_DIR}/WebKit\" >nul 2>nul\n")
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebKit)
add_custom_command(TARGET WebKitGUID PRE_BUILD COMMAND ${WebKitGUID_PRE_BUILD_COMMAND} VERBATIM)
set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")
-file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul")
+file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/*.h\" \"${FORWARDING_HEADERS_DIR}/WebKit\" >nul 2>nul")
add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
set(WebKit_OUTPUT_NAME
Modified: trunk/Source/WebKit2/CMakeLists.txt (215605 => 215606)
--- trunk/Source/WebKit2/CMakeLists.txt 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-04-21 06:08:13 UTC (rev 215606)
@@ -720,7 +720,7 @@
if (WIN32 AND INTERNAL_BUILD)
set(_javascript_Core_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/_javascript_Core/Scripts")
else ()
- set(_javascript_Core_SCRIPTS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/Scripts")
+ set(_javascript_Core_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/_javascript_Core/Scripts")
endif ()
# librt is needed for shm_open on Linux.
Modified: trunk/Source/WebKit2/ChangeLog (215605 => 215606)
--- trunk/Source/WebKit2/ChangeLog 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-21 06:08:13 UTC (rev 215606)
@@ -1,3 +1,17 @@
+2017-04-20 Konstantin Tokarev <[email protected]>
+
+ [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=171071
+
+ Reviewed by Michael Catanzaro.
+
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
+ build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
+ be available for all ports.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
2017-04-20 Brady Eidson <[email protected]>
WebContent process becomes unresponsive after returning nil from async version of -webView:createWebViewWithConfiguration:...
Modified: trunk/Source/WebKit2/PlatformMac.cmake (215605 => 215606)
--- trunk/Source/WebKit2/PlatformMac.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -427,7 +427,7 @@
"${WEBKIT2_DIR}/WebProcess/WebPage/Cocoa"
"${WEBKIT2_DIR}/WebProcess/WebPage/mac"
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
+ "${FORWARDING_HEADERS_DIR}/WebCore"
"${DERIVED_SOURCES_WEBCORE_DIR}"
)
@@ -522,8 +522,8 @@
file(GLOB ObjCHeaders UIProcess/API/Cocoa/*.h)
foreach (_file ${ObjCHeaders})
get_filename_component(_name ${_file} NAME)
- if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_name})
- file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_name} "#import <WebKit2/UIProcess/API/Cocoa/${_name}>")
+ if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/${_name})
+ file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_name} "#import <WebKit2/UIProcess/API/Cocoa/${_name}>")
endif ()
endforeach ()
@@ -583,7 +583,7 @@
WebViewPrivate.h
)
foreach (_file ${WebKitLegacyForwardingHeaders})
- file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
+ file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
endforeach ()
set(ObjCForwardingHeaders
@@ -727,7 +727,7 @@
DOMXPathResult.h
)
foreach (_file ${ObjCForwardingHeaders})
- file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
+ file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
endforeach ()
list(APPEND WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
@@ -735,9 +735,9 @@
)
# FIXME: These should not be necessary.
-file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WKImageCG.h "#import <WebKit2/Shared/API/c/cg/WKImageCG.h>")
-file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
-file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
+file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit2/Shared/API/c/cg/WKImageCG.h>")
+file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
+file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
Modified: trunk/Source/cmake/OptionsGTK.cmake (215605 => 215606)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -427,7 +427,6 @@
set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
set(DERIVED_SOURCES_WEBKIT2GTK_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
-set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
Modified: trunk/Source/cmake/WebKitFS.cmake (215605 => 215606)
--- trunk/Source/cmake/WebKitFS.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/cmake/WebKitFS.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -34,6 +34,8 @@
set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
+set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
+
file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/_javascript_Core/runtime)
Modified: trunk/Source/cmake/WebKitMacros.cmake (215605 => 215606)
--- trunk/Source/cmake/WebKitMacros.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Source/cmake/WebKitMacros.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -332,7 +332,7 @@
if (NOT WIN32)
set(_processing_directories 0)
set(_processing_files 0)
- set(_target_directory "${DERIVED_SOURCES_DIR}/ForwardingHeaders/${_framework}")
+ set(_target_directory "${FORWARDING_HEADERS_DIR}/${_framework}")
file(GLOB _files "${_target_directory}/*.h")
foreach (_file ${_files})
Modified: trunk/Tools/ChangeLog (215605 => 215606)
--- trunk/Tools/ChangeLog 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Tools/ChangeLog 2017-04-21 06:08:13 UTC (rev 215606)
@@ -1,3 +1,22 @@
+2017-04-20 Konstantin Tokarev <[email protected]>
+
+ [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=171071
+
+ Reviewed by Michael Catanzaro.
+
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
+ build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
+ be available for all ports.
+
+ * DumpRenderTree/PlatformMac.cmake:
+ * MiniBrowser/mac/CMakeLists.txt:
+ * MiniBrowser/win/CMakeLists.txt:
+ * TestWebKitAPI/PlatformJSCOnly.cmake:
+ * TestWebKitAPI/PlatformMac.cmake:
+ * TestWebKitAPI/PlatformWin.cmake:
+ * WebKitTestRunner/PlatformMac.cmake:
+
2017-04-20 Joseph Pecoraro <[email protected]>
Test262 bot does not go red with failures
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (215605 => 215606)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -42,10 +42,10 @@
mac
mac/InternalHeaders/WebKit
TestNetscapePlugIn
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy
+ ${FORWARDING_HEADERS_DIR}
+ ${FORWARDING_HEADERS_DIR}/WebCore
+ ${FORWARDING_HEADERS_DIR}/WebKit
+ ${FORWARDING_HEADERS_DIR}/WebKitLegacy
${WEBCORE_DIR}/testing/cocoa
)
Modified: trunk/Tools/MiniBrowser/mac/CMakeLists.txt (215605 => 215606)
--- trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2017-04-21 06:08:13 UTC (rev 215606)
@@ -17,7 +17,6 @@
set(MiniBrowser_INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/Source
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders
${FORWARDING_HEADERS_DIR}
${MINIBROWSER_DIR}
)
Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (215605 => 215606)
--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2017-04-21 06:08:13 UTC (rev 215606)
@@ -1,6 +1,6 @@
set(MiniBrowser_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit"
+ "${FORWARDING_HEADERS_DIR}"
+ "${FORWARDING_HEADERS_DIR}/WebKit"
"${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/Source"
)
Modified: trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake (215605 => 215606)
--- trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -2,7 +2,7 @@
set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF")
include_directories(
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders
+ ${FORWARDING_HEADERS_DIR}
)
if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
Modified: trunk/Tools/TestWebKitAPI/PlatformMac.cmake (215605 => 215606)
--- trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -2,7 +2,7 @@
set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}")
include_directories(
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders
+ ${FORWARDING_HEADERS_DIR}
)
set(test_main_SOURCES
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (215605 => 215606)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -17,8 +17,8 @@
include_directories(
${DERIVED_SOURCES_DIR}
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core
+ ${FORWARDING_HEADERS_DIR}
+ ${FORWARDING_HEADERS_DIR}/_javascript_Core
${TESTWEBKITAPI_DIR}/win
${DERIVED_SOURCES_DIR}/WebKit/Interfaces
)
Modified: trunk/Tools/WebKitTestRunner/PlatformMac.cmake (215605 => 215606)
--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2017-04-21 06:04:20 UTC (rev 215605)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2017-04-21 06:08:13 UTC (rev 215606)
@@ -22,9 +22,9 @@
list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
${DERIVED_SOURCES_DIR}
${DERIVED_SOURCES_DIR}/WebCore
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore
+ ${FORWARDING_HEADERS_DIR}
+ ${FORWARDING_HEADERS_DIR}/_javascript_Core
+ ${FORWARDING_HEADERS_DIR}/WebCore
${WEBCORE_DIR}/testing/cocoa
${WEBKIT_TESTRUNNER_DIR}/cf
${WEBKIT_TESTRUNNER_DIR}/cg
