[CMake] Set WTF_SCRIPTS_DIR
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Apr 2019 18:51:29 +0000 (18:51 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Apr 2019 18:51:29 +0000 (18:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=196917

Reviewed by Konstantin Tokarev.

.:

Define WTF_SCRIPTS_DIR in WebKitFS.cmake and use that within the WEBKIT_COMPUTE_SOURCES
macro. This allows it to be overridden by a port such as the AppleWin internal build.

* Source/cmake/OptionsAppleWin.cmake:
* Source/cmake/OptionsWinCairo.cmake:
* Source/cmake/WebKitFS.cmake:
* Source/cmake/WebKitMacros.cmake:

Source/WTF:

Use WTF_SCRIPTS_DIR for copying the unified sources script.

* wtf/CMakeLists.txt:

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

ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/CMakeLists.txt
Source/cmake/OptionsAppleWin.cmake
Source/cmake/OptionsWinCairo.cmake
Source/cmake/WebKitFS.cmake
Source/cmake/WebKitMacros.cmake

index 83ea5eb..3651886 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2019-04-16  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Set WTF_SCRIPTS_DIR
+        https://bugs.webkit.org/show_bug.cgi?id=196917
+
+        Reviewed by Konstantin Tokarev.
+
+        Define WTF_SCRIPTS_DIR in WebKitFS.cmake and use that within the WEBKIT_COMPUTE_SOURCES
+        macro. This allows it to be overridden by a port such as the AppleWin internal build.
+
+        * Source/cmake/OptionsAppleWin.cmake:
+        * Source/cmake/OptionsWinCairo.cmake:
+        * Source/cmake/WebKitFS.cmake:
+        * Source/cmake/WebKitMacros.cmake:
+
 2019-04-15  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake] WebCore derived sources should only be referenced inside WebCore
index 95c8c5d..bca0335 100644 (file)
@@ -1,3 +1,14 @@
+2019-04-16  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Set WTF_SCRIPTS_DIR
+        https://bugs.webkit.org/show_bug.cgi?id=196917
+
+        Reviewed by Konstantin Tokarev.
+
+        Use WTF_SCRIPTS_DIR for copying the unified sources script.
+
+        * wtf/CMakeLists.txt:
+
 2019-04-15  Myles C. Maxfield  <mmaxfield@apple.com>
 
         [Cocoa] FontPlatformData objects aren't cached at all when using font-family:system-ui
index 80aca50..3c3f251 100644 (file)
@@ -527,10 +527,8 @@ if (MSVC)
         VERBATIM)
 endif ()
 
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/wtf/Scripts)
-
 file(COPY
     ../Scripts/generate-unified-source-bundles.rb
     DESTINATION
-    ${FORWARDING_HEADERS_DIR}/wtf/Scripts
+    ${WTF_SCRIPTS_DIR}
 )
index 5d30d0d..83810e4 100644 (file)
@@ -73,5 +73,6 @@ endif ()
 add_compile_options(/WX /Wv:18)
 
 if (INTERNAL_BUILD)
+    set(WTF_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/WTF/Scripts")
     set(JavaScriptCore_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore/Scripts")
 endif ()
index d5b0350..5712a70 100644 (file)
@@ -54,4 +54,5 @@ set(JavaScriptCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/Derive
 set(WebCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebCore/DerivedSources)
 
 # Override scripts directories
+set(WTF_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/WTF/Scripts)
 set(JavaScriptCore_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/Scripts)
index ea84e76..b182e1a 100644 (file)
@@ -59,6 +59,7 @@ set(WebKitLegacy_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
 set(WebKit_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
 set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
 
+set(WTF_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/wtf/Scripts")
 set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts")
 
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
index fac9d42..a065b1c 100644 (file)
@@ -12,12 +12,6 @@ macro(WEBKIT_COMPUTE_SOURCES _framework)
       list(APPEND _sourceListFileTruePaths "${CMAKE_CURRENT_SOURCE_DIR}/${_sourcesListFile}")
     endforeach ()
 
-    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")
-    endif ()
-
     if (ENABLE_UNIFIED_BUILDS)
         execute_process(COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
             "--derived-sources-path" "${_derivedSourcesPath}"