Changeset 195680 in webkit

Timestamp:

Jan 27, 2016 12:00:17 PM (8 years ago)

Author:

achristensen@apple.com

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.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• PlatformWin.cmake (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2016-01-27  Alex Christensen  <achristensen@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  <achristensen@webkit.org>
 

trunk/Source/WebKit/PlatformWin.cmake

@@ -465 +465 @@
 
 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)