Changeset 222287 in webkit

Timestamp:

Sep 20, 2017 2:09:06 PM (7 years ago)

Author:

pvollan@apple.com

Message:

[Win] Cannot find script to generate unified sources.
​https://bugs.webkit.org/show_bug.cgi?id=177014

Reviewed by Keith Miller.

Source/JavaScriptCore:

The ruby script can now be found in WTF/Scripts in the forwarding headers folder.

• CMakeLists.txt:
• JavaScriptCore.vcxproj/JavaScriptCore.proj:

Source/WTF:

Copy the ruby script to WTF/Scripts in the forwarding headers folder.

• wtf/CMakeLists.txt:

Location:

trunk/Source

Files:

• JavaScriptCore/CMakeLists.txt (modified) (1 diff)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/CMakeLists.txt (modified) (1 diff)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -1024 +1024 @@
 endforeach ()
 
-execute_process(COMMAND ${RUBY_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../WTF/generate-unified-source-bundles.rb
+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 ()
+
+execute_process(COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
   "--derived-sources-path" ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR} ${JavaScriptCore_UNIFIABLE_SOURCES}
   RESULT_VARIABLE generateUnifiedSourcesResult

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-09-20  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Cannot find script to generate unified sources.
+        https://bugs.webkit.org/show_bug.cgi?id=177014
+
+        Reviewed by Keith Miller.
+
+        The ruby script can now be found in WTF/Scripts in the forwarding headers folder.
+
+        * CMakeLists.txt:
+        * JavaScriptCore.vcxproj/JavaScriptCore.proj:
+
 2017-09-20  Alberto Garcia  <berto@igalia.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj

@@ -29 +29 @@
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-        <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
+        <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
   </PropertyGroup>
  

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2017-09-20  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Cannot find script to generate unified sources.
+        https://bugs.webkit.org/show_bug.cgi?id=177014
+
+        Reviewed by Keith Miller.
+
+        Copy the ruby script to WTF/Scripts in the forwarding headers folder.
+
+        * wtf/CMakeLists.txt:
+
 2017-09-20  Alberto Garcia  <berto@igalia.com>
 

trunk/Source/WTF/wtf/CMakeLists.txt

@@ -394 +394 @@
         VERBATIM)
 endif ()
+
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WTF/Scripts)
+
+file(COPY
+    ../generate-unified-source-bundles.rb
+    DESTINATION
+    ${FORWARDING_HEADERS_DIR}/WTF/Scripts
+)