Title: [195545] trunk/Source
Revision
195545
Author
achristen...@apple.com
Date
2016-01-25 12:12:38 -0800 (Mon, 25 Jan 2016)

Log Message

[Win] Copy forwarding headers before building a project
https://bugs.webkit.org/show_bug.cgi?id=153434

Reviewed by Brent Fulgham.

Source/_javascript_Core:

* CMakeLists.txt:
* PlatformWin.cmake:

Source/WebCore:

* CMakeLists.txt:
* PlatformWin.cmake:

Source/WebKit:

* PlatformWin.cmake:

Source/WTF:

* wtf/CMakeLists.txt:
* wtf/PlatformWin.cmake:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/CMakeLists.txt (195544 => 195545)


--- trunk/Source/_javascript_Core/CMakeLists.txt	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/_javascript_Core/CMakeLists.txt	2016-01-25 20:12:38 UTC (rev 195545)
@@ -1383,8 +1383,8 @@
 set_target_properties(_javascript_Core PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
 set_target_properties(_javascript_Core PROPERTIES FOLDER "_javascript_Core")
 
-if (_javascript_Core_POST_BUILD_COMMAND)
-    add_custom_command(TARGET _javascript_Core POST_BUILD COMMAND ${_javascript_Core_POST_BUILD_COMMAND} VERBATIM)
+if (_javascript_Core_PRE_BUILD_COMMAND)
+    add_custom_command(TARGET _javascript_Core PRE_BUILD COMMAND ${_javascript_Core_PRE_BUILD_COMMAND} VERBATIM)
 endif ()
 
 if (_javascript_Core_OUTPUT_NAME)

Modified: trunk/Source/_javascript_Core/ChangeLog (195544 => 195545)


--- trunk/Source/_javascript_Core/ChangeLog	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-01-25 20:12:38 UTC (rev 195545)
@@ -1,3 +1,13 @@
+2016-01-25  Alex Christensen  <achristen...@webkit.org>
+
+        [Win] Copy forwarding headers before building a project
+        https://bugs.webkit.org/show_bug.cgi?id=153434
+
+        Reviewed by Brent Fulgham.
+
+        * CMakeLists.txt:
+        * PlatformWin.cmake:
+
 2016-01-25  Andreas Kling  <akl...@apple.com>
 
         Reduce number of Structures created at startup.

Modified: trunk/Source/_javascript_Core/PlatformWin.cmake (195544 => 195545)


--- trunk/Source/_javascript_Core/PlatformWin.cmake	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/_javascript_Core/PlatformWin.cmake	2016-01-25 20:12:38 UTC (rev 195545)
@@ -31,12 +31,12 @@
 
 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")
+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")
 
 foreach (_directory ${_javascript_Core_FORWARDING_HEADERS_DIRECTORIES})
-    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")
+    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_OUTPUT_NAME _javascript_Core${DEBUG_SUFFIX})

Modified: trunk/Source/WTF/ChangeLog (195544 => 195545)


--- trunk/Source/WTF/ChangeLog	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/WTF/ChangeLog	2016-01-25 20:12:38 UTC (rev 195545)
@@ -1,3 +1,13 @@
+2016-01-25  Alex Christensen  <achristen...@webkit.org>
+
+        [Win] Copy forwarding headers before building a project
+        https://bugs.webkit.org/show_bug.cgi?id=153434
+
+        Reviewed by Brent Fulgham.
+
+        * wtf/CMakeLists.txt:
+        * wtf/PlatformWin.cmake:
+
 2016-01-20  Ryosuke Niwa  <rn...@webkit.org>
 
         HTMLElement::nodeName should not upper case non-ASCII characters

Modified: trunk/Source/WTF/wtf/CMakeLists.txt (195544 => 195545)


--- trunk/Source/WTF/wtf/CMakeLists.txt	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/WTF/wtf/CMakeLists.txt	2016-01-25 20:12:38 UTC (rev 195545)
@@ -295,8 +295,8 @@
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
 endif ()
 
-if (WTF_POST_BUILD_COMMAND)
-    add_custom_command(TARGET WTF POST_BUILD COMMAND ${WTF_POST_BUILD_COMMAND} VERBATIM)
+if (WTF_PRE_BUILD_COMMAND)
+    add_custom_command(TARGET WTF PRE_BUILD COMMAND ${WTF_PRE_BUILD_COMMAND} VERBATIM)
 endif ()
 
 if (WTF_OUTPUT_NAME)

Modified: trunk/Source/WTF/wtf/PlatformWin.cmake (195544 => 195545)


--- trunk/Source/WTF/wtf/PlatformWin.cmake	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/WTF/wtf/PlatformWin.cmake	2016-01-25 20:12:38 UTC (rev 195545)
@@ -29,8 +29,8 @@
     "${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
 )
 
-set(WTF_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WTF/postBuild.cmd")
-file(WRITE "${WTF_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WTF_DIR}/wtf/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_DIR}/WTF/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n")
+set(WTF_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WTF/preBuild.cmd")
+file(WRITE "${WTF_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WTF_DIR}/wtf/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_DIR}/WTF/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n")
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF)
 
 # FIXME: This should run testOSXLevel.cmd if it is available.

Modified: trunk/Source/WebCore/CMakeLists.txt (195544 => 195545)


--- trunk/Source/WebCore/CMakeLists.txt	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/WebCore/CMakeLists.txt	2016-01-25 20:12:38 UTC (rev 195545)
@@ -3775,8 +3775,8 @@
     add_dependencies(WebCore WebCorePreBuild)
 endif ()
 
-if (WebCore_POST_BUILD_COMMAND)
-    add_custom_command(TARGET WebCore POST_BUILD COMMAND ${WebCore_POST_BUILD_COMMAND} VERBATIM)
+if (WebCore_PRE_BUILD_COMMAND)
+    add_custom_command(TARGET WebCore PRE_BUILD COMMAND ${WebCore_PRE_BUILD_COMMAND} VERBATIM)
 endif ()
 
 if (WebCore_OUTPUT_NAME)

Modified: trunk/Source/WebCore/ChangeLog (195544 => 195545)


--- trunk/Source/WebCore/ChangeLog	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/WebCore/ChangeLog	2016-01-25 20:12:38 UTC (rev 195545)
@@ -1,3 +1,13 @@
+2016-01-25  Alex Christensen  <achristen...@webkit.org>
+
+        [Win] Copy forwarding headers before building a project
+        https://bugs.webkit.org/show_bug.cgi?id=153434
+
+        Reviewed by Brent Fulgham.
+
+        * CMakeLists.txt:
+        * PlatformWin.cmake:
+
 2016-01-25  Brady Eidson  <beid...@apple.com>
 
         Modern IDB: Implement getIndexRecord in the SQLite backing store.

Modified: trunk/Source/WebCore/PlatformWin.cmake (195544 => 195545)


--- trunk/Source/WebCore/PlatformWin.cmake	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/WebCore/PlatformWin.cmake	2016-01-25 20:12:38 UTC (rev 195545)
@@ -296,8 +296,8 @@
     file(APPEND "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/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")
+set(WebCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/preBuild.cmd")
+file(WRITE "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
 
 set(WebCore_OUTPUT_NAME
     WebCore${DEBUG_SUFFIX}

Modified: trunk/Source/WebKit/ChangeLog (195544 => 195545)


--- trunk/Source/WebKit/ChangeLog	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/WebKit/ChangeLog	2016-01-25 20:12:38 UTC (rev 195545)
@@ -1,3 +1,12 @@
+2016-01-25  Alex Christensen  <achristen...@webkit.org>
+
+        [Win] Copy forwarding headers before building a project
+        https://bugs.webkit.org/show_bug.cgi?id=153434
+
+        Reviewed by Brent Fulgham.
+
+        * PlatformWin.cmake:
+
 2016-01-22  Darin Adler  <da...@apple.com>
 
         Reduce use of equalIgnoringCase to just ignore ASCII case

Modified: trunk/Source/WebKit/PlatformWin.cmake (195544 => 195545)


--- trunk/Source/WebKit/PlatformWin.cmake	2016-01-25 19:48:45 UTC (rev 195544)
+++ trunk/Source/WebKit/PlatformWin.cmake	2016-01-25 20:12:38 UTC (rev 195545)
@@ -463,7 +463,7 @@
 file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces)
 
-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\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")
+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(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit)
-add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
+add_custom_command(TARGET WebKitGUID PRE_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