[webkit-changes] [222313] tags/Safari-605.1.7/Source

Wed, 20 Sep 2017 22:46:20 -0700

Title: [222313] tags/Safari-605.1.7/Source

Diff

Modified: tags/Safari-605.1.7/Source/_javascript_Core/CMakeLists.txt (222312 => 222313)


--- tags/Safari-605.1.7/Source/_javascript_Core/CMakeLists.txt	2017-09-21 03:36:29 UTC (rev 222312)
+++ tags/Safari-605.1.7/Source/_javascript_Core/CMakeLists.txt	2017-09-21 05:45:08 UTC (rev 222313)
@@ -1023,7 +1023,13 @@
     endif ()
 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} ${_javascript_Core_UNIFIABLE_SOURCES}
   RESULT_VARIABLE generateUnifiedSourcesResult
   OUTPUT_VARIABLE generateUnifiedSourcesOutput

Modified: tags/Safari-605.1.7/Source/_javascript_Core/ChangeLog (222312 => 222313)


--- tags/Safari-605.1.7/Source/_javascript_Core/ChangeLog	2017-09-21 03:36:29 UTC (rev 222312)
+++ tags/Safari-605.1.7/Source/_javascript_Core/ChangeLog	2017-09-21 05:45:08 UTC (rev 222313)
@@ -1,3 +1,19 @@
+2017-09-20  Jason Marcell  <[email protected]>
+
+        Cherry-pick r222287. rdar://problem/34458622
+
+    2017-09-20  Per Arne Vollan  <[email protected]>
+
+            [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:
+            * _javascript_Core.vcxproj/_javascript_Core.proj:
+
 2017-09-18  Filip Pizlo  <[email protected]>
 
         ErrorInstance and Exception need destroy methods

Modified: tags/Safari-605.1.7/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (222312 => 222313)


--- tags/Safari-605.1.7/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj	2017-09-21 03:36:29 UTC (rev 222312)
+++ tags/Safari-605.1.7/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj	2017-09-21 05:45:08 UTC (rev 222313)
@@ -28,7 +28,7 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <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>
  
   <!-- Prepare for build -->

Modified: tags/Safari-605.1.7/Source/WTF/ChangeLog (222312 => 222313)


--- tags/Safari-605.1.7/Source/WTF/ChangeLog	2017-09-21 03:36:29 UTC (rev 222312)
+++ tags/Safari-605.1.7/Source/WTF/ChangeLog	2017-09-21 05:45:08 UTC (rev 222313)
@@ -1,3 +1,18 @@
+2017-09-20  Jason Marcell  <[email protected]>
+
+        Cherry-pick r222287. rdar://problem/34458622
+
+    2017-09-20  Per Arne Vollan  <[email protected]>
+
+            [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-19  Youenn Fablet  <[email protected]>
 
         Allow WTF::map to use any class that is iterable and has a size getter

Modified: tags/Safari-605.1.7/Source/WTF/wtf/CMakeLists.txt (222312 => 222313)


--- tags/Safari-605.1.7/Source/WTF/wtf/CMakeLists.txt	2017-09-21 03:36:29 UTC (rev 222312)
+++ tags/Safari-605.1.7/Source/WTF/wtf/CMakeLists.txt	2017-09-21 05:45:08 UTC (rev 222313)
@@ -393,3 +393,11 @@
         COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_DIR} $<TARGET_FILE:WTF>
         VERBATIM)
 endif ()
+
+file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WTF/Scripts)
+
+file(COPY
+    ../generate-unified-source-bundles.rb
+    DESTINATION
+    ${FORWARDING_HEADERS_DIR}/WTF/Scripts
+)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to