Title: [222287] trunk/Source
- Revision
- 222287
- Author
- pvol...@apple.com
- Date
- 2017-09-20 14:09:06 -0700 (Wed, 20 Sep 2017)
Log Message
[Win] Cannot find script to generate unified sources.
https://bugs.webkit.org/show_bug.cgi?id=177014
Reviewed by Keith Miller.
Source/_javascript_Core:
The ruby script can now be found in WTF/Scripts in the forwarding headers folder.
* CMakeLists.txt:
* _javascript_Core.vcxproj/_javascript_Core.proj:
Source/WTF:
Copy the ruby script to WTF/Scripts in the forwarding headers folder.
* wtf/CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (222286 => 222287)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2017-09-20 21:01:15 UTC (rev 222286)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2017-09-20 21:09:06 UTC (rev 222287)
@@ -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: trunk/Source/_javascript_Core/ChangeLog (222286 => 222287)
--- trunk/Source/_javascript_Core/ChangeLog 2017-09-20 21:01:15 UTC (rev 222286)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-09-20 21:09:06 UTC (rev 222287)
@@ -1,3 +1,15 @@
+2017-09-20 Per Arne Vollan <pvol...@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:
+ * _javascript_Core.vcxproj/_javascript_Core.proj:
+
2017-09-20 Alberto Garcia <be...@igalia.com>
Fix HPPA and Alpha builds
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (222286 => 222287)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2017-09-20 21:01:15 UTC (rev 222286)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2017-09-20 21:09:06 UTC (rev 222287)
@@ -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: trunk/Source/WTF/ChangeLog (222286 => 222287)
--- trunk/Source/WTF/ChangeLog 2017-09-20 21:01:15 UTC (rev 222286)
+++ trunk/Source/WTF/ChangeLog 2017-09-20 21:09:06 UTC (rev 222287)
@@ -1,3 +1,14 @@
+2017-09-20 Per Arne Vollan <pvol...@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 <be...@igalia.com>
Fix HPPA and Alpha builds
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (222286 => 222287)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2017-09-20 21:01:15 UTC (rev 222286)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2017-09-20 21:09:06 UTC (rev 222287)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
