Title: [226176] trunk
- Revision
- 226176
- Author
- [email protected]
- Date
- 2017-12-20 06:25:50 -0800 (Wed, 20 Dec 2017)
Log Message
[CMake][WTF] Lowercase ForwardingHeaders directory name of WTF
https://bugs.webkit.org/show_bug.cgi?id=181022
Patch by Fujii Hironori <[email protected]> on 2017-12-20
Reviewed by Konstantin Tokarev.
.:
ForwardingHeaders of WTF are included as <wtf/FooBar.h>. But, the
directory name was uppercase DerivedSources/ForwardingHeaders/WTF.
This confuses Ninja dependency tracking. It should be lowercase.
* Source/cmake/WebKitMacros.cmake: Renamed ForwardingHeaders directory name WTF to wtf.
Source/WTF:
* wtf/CMakeLists.txt: Renamed ForwardingHeaders directory name WTF to wtf.
* wtf/PlatformWin.cmake: Ditto.
Modified Paths
Diff
Modified: trunk/ChangeLog (226175 => 226176)
--- trunk/ChangeLog 2017-12-20 14:24:00 UTC (rev 226175)
+++ trunk/ChangeLog 2017-12-20 14:25:50 UTC (rev 226176)
@@ -1,3 +1,16 @@
+2017-12-20 Fujii Hironori <[email protected]>
+
+ [CMake][WTF] Lowercase ForwardingHeaders directory name of WTF
+ https://bugs.webkit.org/show_bug.cgi?id=181022
+
+ Reviewed by Konstantin Tokarev.
+
+ ForwardingHeaders of WTF are included as <wtf/FooBar.h>. But, the
+ directory name was uppercase DerivedSources/ForwardingHeaders/WTF.
+ This confuses Ninja dependency tracking. It should be lowercase.
+
+ * Source/cmake/WebKitMacros.cmake: Renamed ForwardingHeaders directory name WTF to wtf.
+
2017-12-16 Basuke Suzuki <[email protected]>
[WinCairo] Move the destination of WinCairoRequirements.zip into WebKitLibraries and register it and related files as git ignore files.
Modified: trunk/Source/WTF/ChangeLog (226175 => 226176)
--- trunk/Source/WTF/ChangeLog 2017-12-20 14:24:00 UTC (rev 226175)
+++ trunk/Source/WTF/ChangeLog 2017-12-20 14:25:50 UTC (rev 226176)
@@ -1,3 +1,13 @@
+2017-12-20 Fujii Hironori <[email protected]>
+
+ [CMake][WTF] Lowercase ForwardingHeaders directory name of WTF
+ https://bugs.webkit.org/show_bug.cgi?id=181022
+
+ Reviewed by Konstantin Tokarev.
+
+ * wtf/CMakeLists.txt: Renamed ForwardingHeaders directory name WTF to wtf.
+ * wtf/PlatformWin.cmake: Ditto.
+
2017-12-19 Brian Burg <[email protected]>
SLEEP_THREAD_FOR_DEBUGGER() macro should try to print out the PID of the affected process
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (226175 => 226176)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2017-12-20 14:24:00 UTC (rev 226175)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2017-12-20 14:25:50 UTC (rev 226176)
@@ -415,10 +415,10 @@
VERBATIM)
endif ()
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WTF/Scripts)
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/wtf/Scripts)
file(COPY
../Scripts/generate-unified-source-bundles.rb
DESTINATION
- ${FORWARDING_HEADERS_DIR}/WTF/Scripts
+ ${FORWARDING_HEADERS_DIR}/wtf/Scripts
)
Modified: trunk/Source/WTF/wtf/PlatformWin.cmake (226175 => 226176)
--- trunk/Source/WTF/wtf/PlatformWin.cmake 2017-12-20 14:24:00 UTC (rev 226175)
+++ trunk/Source/WTF/wtf/PlatformWin.cmake 2017-12-20 14:25:50 UTC (rev 226176)
@@ -27,7 +27,7 @@
endif ()
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)
+file(WRITE "${WTF_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WTF_DIR}/wtf/*.h\" \"${FORWARDING_HEADERS_DIR}/wtf\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_DIR}/WTF/*.h\" \"${FORWARDING_HEADERS_DIR}/wtf\" >nul 2>nul\n")
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/wtf)
set(WTF_OUTPUT_NAME WTF${DEBUG_SUFFIX})
Modified: trunk/Source/cmake/WebKitMacros.cmake (226175 => 226176)
--- trunk/Source/cmake/WebKitMacros.cmake 2017-12-20 14:24:00 UTC (rev 226175)
+++ trunk/Source/cmake/WebKitMacros.cmake 2017-12-20 14:25:50 UTC (rev 226176)
@@ -13,7 +13,7 @@
if (WIN32 AND INTERNAL_BUILD)
set(WTF_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/WTF/Scripts")
else ()
- set(WTF_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/WTF/Scripts")
+ set(WTF_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/wtf/Scripts")
endif ()
execute_process(COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
