Title: [195593] trunk/Source/_javascript_Core
- Revision
- 195593
- Author
- achristen...@apple.com
- Date
- 2016-01-26 09:23:34 -0800 (Tue, 26 Jan 2016)
Log Message
[Win] Fix clean build after r195545.
https://bugs.webkit.org/show_bug.cgi?id=153434
* CMakeLists.txt:
* PlatformWin.cmake:
Derived sources need to be copied after the build, but everything else should be copied before.
This should fix ews issues like the one seen in bug 153473.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (195592 => 195593)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2016-01-26 17:17:49 UTC (rev 195592)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2016-01-26 17:23:34 UTC (rev 195593)
@@ -1387,6 +1387,10 @@
add_custom_command(TARGET _javascript_Core PRE_BUILD COMMAND ${_javascript_Core_PRE_BUILD_COMMAND} VERBATIM)
endif ()
+if (_javascript_Core_POST_BUILD_COMMAND)
+ add_custom_command(TARGET _javascript_Core POST_BUILD COMMAND ${_javascript_Core_POST_BUILD_COMMAND} VERBATIM)
+endif ()
+
if (_javascript_Core_OUTPUT_NAME)
set_target_properties(_javascript_Core PROPERTIES OUTPUT_NAME ${_javascript_Core_OUTPUT_NAME})
endif ()
Modified: trunk/Source/_javascript_Core/ChangeLog (195592 => 195593)
--- trunk/Source/_javascript_Core/ChangeLog 2016-01-26 17:17:49 UTC (rev 195592)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-01-26 17:23:34 UTC (rev 195593)
@@ -1,3 +1,13 @@
+2016-01-26 Alex Christensen <achristen...@webkit.org>
+
+ [Win] Fix clean build after r195545.
+ https://bugs.webkit.org/show_bug.cgi?id=153434
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+ Derived sources need to be copied after the build, but everything else should be copied before.
+ This should fix ews issues like the one seen in bug 153473.
+
2016-01-25 Filip Pizlo <fpi...@apple.com>
FTLB3Output should maintain good block order like the LLVM one does
Modified: trunk/Source/_javascript_Core/PlatformWin.cmake (195592 => 195593)
--- trunk/Source/_javascript_Core/PlatformWin.cmake 2016-01-26 17:17:49 UTC (rev 195592)
+++ trunk/Source/_javascript_Core/PlatformWin.cmake 2016-01-26 17:23:34 UTC (rev 195593)
@@ -32,11 +32,13 @@
file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core)
set(_javascript_Core_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core/preBuild.cmd")
-file(WRITE "${_javascript_Core_PRE_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_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/_javascript_Core/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core\" >nul 2>nul\n")
-
+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")
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")
+
set(_javascript_Core_OUTPUT_NAME _javascript_Core${DEBUG_SUFFIX})
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
