Title: [195680] trunk/Source/WebKit
Revision
195680
Author
achristen...@apple.com
Date
2016-01-27 12:00:17 -0800 (Wed, 27 Jan 2016)

Log Message

Fix Win EWS after r195545.
https://bugs.webkit.org/show_bug.cgi?id=153434

* PlatformWin.cmake:
Copy WebKit.h after building WebKitGUID, because it doesn't exist before.
This should fix EWS problems like the one seen in bug 153522.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (195679 => 195680)


--- trunk/Source/WebKit/ChangeLog	2016-01-27 19:54:10 UTC (rev 195679)
+++ trunk/Source/WebKit/ChangeLog	2016-01-27 20:00:17 UTC (rev 195680)
@@ -1,3 +1,12 @@
+2016-01-27  Alex Christensen  <achristen...@webkit.org>
+
+        Fix Win EWS after r195545.
+        https://bugs.webkit.org/show_bug.cgi?id=153434
+
+        * PlatformWin.cmake:
+        Copy WebKit.h after building WebKitGUID, because it doesn't exist before.
+        This should fix EWS problems like the one seen in bug 153522.
+
 2016-01-25  Alex Christensen  <achristen...@webkit.org>
 
         [Win] Copy forwarding headers before building a project

Modified: trunk/Source/WebKit/PlatformWin.cmake (195679 => 195680)


--- trunk/Source/WebKit/PlatformWin.cmake	2016-01-27 19:54:10 UTC (rev 195679)
+++ trunk/Source/WebKit/PlatformWin.cmake	2016-01-27 20:00:17 UTC (rev 195680)
@@ -464,6 +464,10 @@
 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 \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@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(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)
 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/WebKit.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul")
+add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_PRE_BUILD_COMMAND} VERBATIM)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to