Title: [189055] trunk
- Revision
- 189055
- Author
- [email protected]
- Date
- 2015-08-27 14:31:43 -0700 (Thu, 27 Aug 2015)
Log Message
[Win CMake] Fix incremental build after r188673
https://bugs.webkit.org/show_bug.cgi?id=148539
Reviewed by Brent Fulgham.
Source/_javascript_Core:
* PlatformWin.cmake:
Use xcopy as a build step instead of file(COPY ...) to copy updated headers.
Source/WebCore:
* CMakeLists.txt:
* PlatformWin.cmake:
Use xcopy as a build step instead of file(COPY ...) to copy updated headers.
Tools:
* TestWebKitAPI/PlatformWin.cmake:
Copy forwarding headers from WebCore before building in case that was not yet done.
It used to be done when running CMake, but now it's a build step.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (189054 => 189055)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-27 21:26:24 UTC (rev 189054)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-27 21:31:43 UTC (rev 189055)
@@ -1,3 +1,13 @@
+2015-08-27 Alex Christensen <[email protected]>
+
+ [Win CMake] Fix incremental build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148539
+
+ Reviewed by Brent Fulgham.
+
+ * PlatformWin.cmake:
+ Use xcopy as a build step instead of file(COPY ...) to copy updated headers.
+
2015-08-27 Jon Davis <[email protected]>
Include ES6 Generators and Proxy object status to feature status page.
Modified: trunk/Source/_javascript_Core/PlatformWin.cmake (189054 => 189055)
--- trunk/Source/_javascript_Core/PlatformWin.cmake 2015-08-27 21:26:24 UTC (rev 189054)
+++ trunk/Source/_javascript_Core/PlatformWin.cmake 2015-08-27 21:31:43 UTC (rev 189055)
@@ -35,15 +35,12 @@
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core)
+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")
foreach (_directory ${_javascript_Core_FORWARDING_HEADERS_DIRECTORIES})
- file(GLOB _files "${_javascript_CORE_DIR}/${_directory}/*.h")
- foreach (_file ${_files})
- file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core")
- endforeach ()
+ file(APPEND "${_javascript_Core_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${_javascript_CORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_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@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/_javascript_Core/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core\" >nul 2>nul\n")
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core)
-
set(_javascript_Core_OUTPUT_NAME _javascript_Core${DEBUG_SUFFIX})
Modified: trunk/Source/WebCore/CMakeLists.txt (189054 => 189055)
--- trunk/Source/WebCore/CMakeLists.txt 2015-08-27 21:26:24 UTC (rev 189054)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-27 21:31:43 UTC (rev 189055)
@@ -3615,6 +3615,11 @@
ADD_TARGET_PROPERTIES(WebCore COMPILE_FLAGS "-fno-tree-sra")
endif ()
+if (WebCore_PRE_BUILD_COMMAND)
+ add_custom_target(WebCorePreBuild COMMAND ${WebCore_PRE_BUILD_COMMAND} VERBATIM)
+ add_dependencies(WebCore WebCorePreBuild)
+endif ()
+
if (WebCore_POST_BUILD_COMMAND)
add_custom_command(TARGET WebCore POST_BUILD COMMAND ${WebCore_POST_BUILD_COMMAND} VERBATIM)
endif ()
Modified: trunk/Source/WebCore/ChangeLog (189054 => 189055)
--- trunk/Source/WebCore/ChangeLog 2015-08-27 21:26:24 UTC (rev 189054)
+++ trunk/Source/WebCore/ChangeLog 2015-08-27 21:31:43 UTC (rev 189055)
@@ -1,3 +1,14 @@
+2015-08-27 Alex Christensen <[email protected]>
+
+ [Win CMake] Fix incremental build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148539
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+ Use xcopy as a build step instead of file(COPY ...) to copy updated headers.
+
2015-08-27 Timothy Horton <[email protected]>
Factor out Lookup invocation
Modified: trunk/Source/WebCore/PlatformWin.cmake (189054 => 189055)
--- trunk/Source/WebCore/PlatformWin.cmake 2015-08-27 21:26:24 UTC (rev 189054)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-08-27 21:31:43 UTC (rev 189055)
@@ -271,22 +271,15 @@
file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore)
+set(WebCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/preBuild.cmd")
+file(WRITE "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
foreach (_directory ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
- file(GLOB _files "${WEBCORE_DIR}/${_directory}/*.h")
- foreach (_file ${_files})
- file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore")
- endforeach ()
+ file(APPEND "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
endforeach ()
-# These forwarding headers need to keep their directory structure.
set(WebCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/postBuild.cmd")
-file(WRITE "${WebCore_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n@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\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
-file(GLOB_RECURSE _files "${WEBCORE_DIR}/ForwardingHeaders/*.h")
-foreach (_file ${_files})
- file(COPY ${_file} DESTINATION "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore")
-endforeach ()
-
set(WebCore_OUTPUT_NAME
WebCore${DEBUG_SUFFIX}
)
\ No newline at end of file
Modified: trunk/Tools/ChangeLog (189054 => 189055)
--- trunk/Tools/ChangeLog 2015-08-27 21:26:24 UTC (rev 189054)
+++ trunk/Tools/ChangeLog 2015-08-27 21:31:43 UTC (rev 189055)
@@ -1,3 +1,14 @@
+2015-08-27 Alex Christensen <[email protected]>
+
+ [Win CMake] Fix incremental build after r188673
+ https://bugs.webkit.org/show_bug.cgi?id=148539
+
+ Reviewed by Brent Fulgham.
+
+ * TestWebKitAPI/PlatformWin.cmake:
+ Copy forwarding headers from WebCore before building in case that was not yet done.
+ It used to be done when running CMake, but now it's a build step.
+
2015-08-27 Nan Wang <[email protected]>
AX: Fix accessibility/select-element-at-index.html test
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (189054 => 189055)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-27 21:26:24 UTC (rev 189054)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-27 21:31:43 UTC (rev 189055)
@@ -2,6 +2,11 @@
set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}")
add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
+add_custom_target(forwarding-headersWinForTestWebKitAPI
+ COMMAND ${CMAKE_BINARY_DIR}/DerivedSources/WebCore/preBuild.cmd VERBATIM
+)
+set(ForwardingHeadersForTestWebKitAPI_NAME forwarding-headersWinForTestWebKitAPI)
+
if (${WTF_PLATFORM_WIN_CAIRO})
add_definitions(-DWIN_CAIRO)
endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
