Title: [264417] trunk/Source
- Revision
- 264417
- Author
- hironori.fu...@sony.com
- Date
- 2020-07-15 13:18:13 -0700 (Wed, 15 Jul 2020)
Log Message
[CMake][WebDriver] Generating WebDriverAtoms.cpp is rarely failing as "ImportError: No module named jsmin"
https://bugs.webkit.org/show_bug.cgi?id=214339
Reviewed by Don Olmstead.
Source/_javascript_Core:
* CMakeLists.txt: Renamed stageSharedScripts to _javascript_CoreSharedScripts.
Source/WebDriver:
There are a race condition between copying jsmin.py in
_javascript_Core and using it in WebDriver. WebDriver target should
have a dependency to it.
* CMakeLists.txt: Added add_dependencies for WebDriver.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (264416 => 264417)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2020-07-15 20:03:17 UTC (rev 264416)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2020-07-15 20:18:13 UTC (rev 264417)
@@ -1410,8 +1410,8 @@
# Force staging of shared scripts, even if they aren't directly used to build _javascript_Core.
-add_custom_target(stageSharedScripts DEPENDS ${_javascript_Core_SCRIPTS})
-add_dependencies(_javascript_Core stageSharedScripts ${_javascript_Core_EXTRA_DEPENDENCIES})
+add_custom_target(_javascript_CoreSharedScripts DEPENDS ${_javascript_Core_SCRIPTS})
+add_dependencies(_javascript_Core _javascript_CoreSharedScripts ${_javascript_Core_EXTRA_DEPENDENCIES})
# _javascript_Core target needs to have a direct or indirect dependency
# of InspectorBackendCommands for CMake Visual Studio generator to
Modified: trunk/Source/_javascript_Core/ChangeLog (264416 => 264417)
--- trunk/Source/_javascript_Core/ChangeLog 2020-07-15 20:03:17 UTC (rev 264416)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-07-15 20:18:13 UTC (rev 264417)
@@ -1,3 +1,12 @@
+2020-07-15 Fujii Hironori <hironori.fu...@sony.com>
+
+ [CMake][WebDriver] Generating WebDriverAtoms.cpp is rarely failing as "ImportError: No module named jsmin"
+ https://bugs.webkit.org/show_bug.cgi?id=214339
+
+ Reviewed by Don Olmstead.
+
+ * CMakeLists.txt: Renamed stageSharedScripts to _javascript_CoreSharedScripts.
+
2020-07-15 Mark Lam <mark....@apple.com>
Add handling of out of memory handling while adding a worklet module.
Modified: trunk/Source/WebDriver/CMakeLists.txt (264416 => 264417)
--- trunk/Source/WebDriver/CMakeLists.txt 2020-07-15 20:03:17 UTC (rev 264416)
+++ trunk/Source/WebDriver/CMakeLists.txt 2020-07-15 20:18:13 UTC (rev 264417)
@@ -42,6 +42,8 @@
WEBKIT_EXECUTABLE_DECLARE(WebDriver)
+add_dependencies(WebDriver _javascript_CoreSharedScripts)
+
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_EXECUTABLE(WebDriver)
Modified: trunk/Source/WebDriver/ChangeLog (264416 => 264417)
--- trunk/Source/WebDriver/ChangeLog 2020-07-15 20:03:17 UTC (rev 264416)
+++ trunk/Source/WebDriver/ChangeLog 2020-07-15 20:18:13 UTC (rev 264417)
@@ -1,3 +1,16 @@
+2020-07-15 Fujii Hironori <hironori.fu...@sony.com>
+
+ [CMake][WebDriver] Generating WebDriverAtoms.cpp is rarely failing as "ImportError: No module named jsmin"
+ https://bugs.webkit.org/show_bug.cgi?id=214339
+
+ Reviewed by Don Olmstead.
+
+ There are a race condition between copying jsmin.py in
+ _javascript_Core and using it in WebDriver. WebDriver target should
+ have a dependency to it.
+
+ * CMakeLists.txt: Added add_dependencies for WebDriver.
+
2020-06-26 Geoffrey Garen <gga...@apple.com>
Initializing the main thread should initialize the main run loop
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
