[CMake][WTF] Lowercase ForwardingHeaders directory name of WTF
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Dec 2017 14:25:50 +0000 (14:25 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Dec 2017 14:25:50 +0000 (14:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=181022

Patch by Fujii Hironori <Hironori.Fujii@sony.com> 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226176 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/CMakeLists.txt
Source/WTF/wtf/PlatformWin.cmake
Source/cmake/WebKitMacros.cmake

index 16e9d18..b0bc835 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2017-12-20  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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  <Basuke.Suzuki@sony.com>
 
         [WinCairo] Move the destination of WinCairoRequirements.zip into WebKitLibraries and register it and related files as git ignore files.
index 61af91b..50d6d5c 100644 (file)
@@ -1,3 +1,13 @@
+2017-12-20  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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  <bburg@apple.com>
 
         SLEEP_THREAD_FOR_DEBUGGER() macro should try to print out the PID of the affected process
index 56609e5..09b0476 100644 (file)
@@ -415,10 +415,10 @@ if (MSVC)
         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
 )
index a2454ac..14d9d34 100644 (file)
@@ -27,7 +27,7 @@ if (USE_CF)
 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})
index fa32fe8..370b82f 100644 (file)
@@ -13,7 +13,7 @@ macro(WEBKIT_COMPUTE_SOURCES _framework)
     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