Title: [262096] trunk
- Revision
- 262096
- Author
- [email protected]
- Date
- 2020-05-22 22:55:53 -0700 (Fri, 22 May 2020)
Log Message
[PlayStation] Enable JSC shell to run
https://bugs.webkit.org/show_bug.cgi?id=212294
Reviewed by Ross Kirsling.
.:
* Source/cmake/OptionsPlayStation.cmake:
Source/_javascript_Core:
* shell/PlatformPlayStation.cmake:
Set working directory for Visual Studio
* shell/playstation/Initializer.cpp:
Load libJavaScriptCore as we now build it as SHARED.
Modified Paths
Diff
Modified: trunk/ChangeLog (262095 => 262096)
--- trunk/ChangeLog 2020-05-23 05:53:52 UTC (rev 262095)
+++ trunk/ChangeLog 2020-05-23 05:55:53 UTC (rev 262096)
@@ -1,3 +1,12 @@
+2020-05-22 Yoshiaki JITSUKAWA <[email protected]>
+
+ [PlayStation] Enable JSC shell to run
+ https://bugs.webkit.org/show_bug.cgi?id=212294
+
+ Reviewed by Ross Kirsling.
+
+ * Source/cmake/OptionsPlayStation.cmake:
+
2020-05-21 Yoshiaki Jitsukawa <[email protected]>
[PlayStation] Add minimal WKView API to enable TestWebKitAPI
Modified: trunk/Source/_javascript_Core/ChangeLog (262095 => 262096)
--- trunk/Source/_javascript_Core/ChangeLog 2020-05-23 05:53:52 UTC (rev 262095)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-05-23 05:55:53 UTC (rev 262096)
@@ -1,3 +1,15 @@
+2020-05-22 Yoshiaki JITSUKAWA <[email protected]>
+
+ [PlayStation] Enable JSC shell to run
+ https://bugs.webkit.org/show_bug.cgi?id=212294
+
+ Reviewed by Ross Kirsling.
+
+ * shell/PlatformPlayStation.cmake:
+ Set working directory for Visual Studio
+ * shell/playstation/Initializer.cpp:
+ Load libJavaScriptCore as we now build it as SHARED.
+
2020-05-22 Alexey Shvayka <[email protected]>
Array.prototype.splice doesn't set "length" of returned object
Modified: trunk/Source/_javascript_Core/shell/PlatformPlayStation.cmake (262095 => 262096)
--- trunk/Source/_javascript_Core/shell/PlatformPlayStation.cmake 2020-05-23 05:53:52 UTC (rev 262095)
+++ trunk/Source/_javascript_Core/shell/PlatformPlayStation.cmake 2020-05-23 05:55:53 UTC (rev 262096)
@@ -19,3 +19,8 @@
set(PLAYSTATION_jsc_PROCESS_NAME "JSCShell")
set(PLAYSTATION_jsc_MAIN_THREAD_NAME "JSCShell")
+
+# Set the debugger working directory for Visual Studio
+if (${CMAKE_GENERATOR} MATCHES "Visual Studio")
+ set_target_properties(jsc PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+endif ()
Modified: trunk/Source/_javascript_Core/shell/playstation/Initializer.cpp (262095 => 262096)
--- trunk/Source/_javascript_Core/shell/playstation/Initializer.cpp 2020-05-23 05:53:52 UTC (rev 262095)
+++ trunk/Source/_javascript_Core/shell/playstation/Initializer.cpp 2020-05-23 05:55:53 UTC (rev 262096)
@@ -29,16 +29,19 @@
#include "config.h"
#include <dlfcn.h>
+static void loadLibraryOrExit(const char* name)
+{
+ if (!dlopen(name, RTLD_NOW)) {
+ fprintf(stderr, "Failed to load %s.\n", name);
+ exit(EXIT_FAILURE);
+ }
+}
+
__attribute__((constructor(101)))
static void initializer(void)
{
- void* handle = dlopen("SystemServices", RTLD_NOW);
- if (!handle)
- exit(1);
- handle = dlopen("Perf", RTLD_NOW);
- if (!handle)
- exit(1);
- handle = dlopen("PosixWebKit", RTLD_NOW);
- if (!handle)
- exit(1);
+ loadLibraryOrExit("SystemServices");
+ loadLibraryOrExit("Perf");
+ loadLibraryOrExit("PosixWebKit");
+ loadLibraryOrExit("libJavaScriptCore");
}
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (262095 => 262096)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2020-05-23 05:53:52 UTC (rev 262095)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2020-05-23 05:55:53 UTC (rev 262096)
@@ -232,6 +232,12 @@
target_link_options(${_target} PRIVATE -Wl,--wrap=${WRAP})
endforeach ()
endif ()
+ add_custom_command(TARGET ${_target}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${WEBKIT_LIBRARIES_DIR}/tools/sce_sys/
+ $<TARGET_FILE_DIR:${_target}>/sce_sys/
+ )
endmacro()
function(PLAYSTATION_COPY_SHARED_LIBRARIES target_name)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
