Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (282294 => 282295)
--- trunk/Source/_javascript_Core/ChangeLog 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-09-10 22:32:43 UTC (rev 282295)
@@ -1,3 +1,15 @@
+2021-09-10 Stephan Szabo <stephan.sz...@sony.com>
+
+ [PlayStation] Support running applications with ENABLE_STATIC_JSC=ON
+ https://bugs.webkit.org/show_bug.cgi?id=230170
+
+ Reviewed by Ross Kirsling.
+
+ Updating loading code to not load libJavaScriptCore shared library
+ if we are using a static version.
+
+ * shell/playstation/Initializer.cpp:
+
2021-09-09 Ross Kirsling <ross.kirsl...@sony.com>
[JSC] Clean up current state of Temporal API
Modified: trunk/Source/_javascript_Core/shell/playstation/Initializer.cpp (282294 => 282295)
--- trunk/Source/_javascript_Core/shell/playstation/Initializer.cpp 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Source/_javascript_Core/shell/playstation/Initializer.cpp 2021-09-10 22:32:43 UTC (rev 282295)
@@ -43,6 +43,8 @@
loadLibraryOrExit("SystemServices");
loadLibraryOrExit("Perf");
loadLibraryOrExit("PosixWebKit");
+#if !ENABLE(STATIC_JSC)
loadLibraryOrExit("libJavaScriptCore");
+#endif
loadLibraryOrExit("libicu");
}
Modified: trunk/Source/WebKit/ChangeLog (282294 => 282295)
--- trunk/Source/WebKit/ChangeLog 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Source/WebKit/ChangeLog 2021-09-10 22:32:43 UTC (rev 282295)
@@ -1,3 +1,16 @@
+2021-09-10 Stephan Szabo <stephan.sz...@sony.com>
+
+ [PlayStation] Support running applications with ENABLE_STATIC_JSC=ON
+ https://bugs.webkit.org/show_bug.cgi?id=230170
+
+ Reviewed by Ross Kirsling.
+
+ Updating loading code to not load libJavaScriptCore shared library
+ if we are using a static version.
+
+ * NetworkProcess/EntryPoint/playstation/NetworkProcessMain.cpp:
+ * WebProcess/EntryPoint/playstation/WebProcessMain.cpp:
+
2021-09-10 Per Arne <pvol...@apple.com>
[macOS] Close XPC connection before entering the WP sandbox
Modified: trunk/Source/WebKit/NetworkProcess/EntryPoint/playstation/NetworkProcessMain.cpp (282294 => 282295)
--- trunk/Source/WebKit/NetworkProcess/EntryPoint/playstation/NetworkProcessMain.cpp 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Source/WebKit/NetworkProcess/EntryPoint/playstation/NetworkProcessMain.cpp 2021-09-10 22:32:43 UTC (rev 282295)
@@ -54,7 +54,9 @@
loadLibraryOrExit("libcurl");
loadLibraryOrExit("libicu");
loadLibraryOrExit("libSceNKWebKitRequirements");
+#if !ENABLE(STATIC_JSC)
loadLibraryOrExit("libJavaScriptCore");
+#endif
loadLibraryOrExit("libWebKit");
char* coreProcessIdentifier = argv[1];
Modified: trunk/Source/WebKit/WebProcess/EntryPoint/playstation/WebProcessMain.cpp (282294 => 282295)
--- trunk/Source/WebKit/WebProcess/EntryPoint/playstation/WebProcessMain.cpp 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Source/WebKit/WebProcess/EntryPoint/playstation/WebProcessMain.cpp 2021-09-10 22:32:43 UTC (rev 282295)
@@ -54,7 +54,9 @@
loadLibraryOrExit("libharfbuzz");
loadLibraryOrExit("libcairo");
loadLibraryOrExit("libSceNKWebKitRequirements");
+#if !ENABLE(STATIC_JSC)
loadLibraryOrExit("libJavaScriptCore");
+#endif
loadLibraryOrExit("libWebKit");
char* coreProcessIdentifier = argv[1];
Modified: trunk/Tools/ChangeLog (282294 => 282295)
--- trunk/Tools/ChangeLog 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Tools/ChangeLog 2021-09-10 22:32:43 UTC (rev 282295)
@@ -1,3 +1,18 @@
+2021-09-10 Stephan Szabo <stephan.sz...@sony.com>
+
+ [PlayStation] Support running applications with ENABLE_STATIC_JSC=ON
+ https://bugs.webkit.org/show_bug.cgi?id=230170
+
+ Reviewed by Ross Kirsling.
+
+ Updating loading code to not load libJavaScriptCore shared library
+ if we are using a static version. Fix platform bits for
+ TestJavaScriptCore to load libraries at all.
+
+ * MiniBrowser/playstation/main.cpp:
+ * TestWebKitAPI/PlatformPlayStation.cmake:
+ * TestWebKitAPI/playstation/main.cpp:
+
2021-09-10 Jonathan Bedard <jbed...@apple.com>
[webkitcorepy] AutoInstall occasionally raising SSL error
Modified: trunk/Tools/MiniBrowser/playstation/main.cpp (282294 => 282295)
--- trunk/Tools/MiniBrowser/playstation/main.cpp 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Tools/MiniBrowser/playstation/main.cpp 2021-09-10 22:32:43 UTC (rev 282295)
@@ -23,10 +23,12 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
#include "MainWindow.h"
#include <WebKit/WKRunLoop.h>
#include <dlfcn.h>
#include <toolkitten/Application.h>
+#include <wtf/Platform.h>
using toolkitten::Widget;
using toolkitten::Application;
@@ -53,7 +55,9 @@
loadLibraryOrExit("libcairo");
loadLibraryOrExit("libToolKitten");
loadLibraryOrExit("libSceNKWebKitRequirements");
+#if !ENABLE(STATIC_JSC)
loadLibraryOrExit("libJavaScriptCore");
+#endif
loadLibraryOrExit("libWebKit");
}
Modified: trunk/Tools/TestWebKitAPI/PlatformPlayStation.cmake (282294 => 282295)
--- trunk/Tools/TestWebKitAPI/PlatformPlayStation.cmake 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Tools/TestWebKitAPI/PlatformPlayStation.cmake 2021-09-10 22:32:43 UTC (rev 282295)
@@ -10,6 +10,10 @@
generic/UtilitiesGeneric.cpp
)
+list(APPEND TestJavaScriptCore_SOURCES
+ ${test_main_SOURCES}
+)
+
list(APPEND TestWebCore_SOURCES
${test_main_SOURCES}
)
Modified: trunk/Tools/TestWebKitAPI/playstation/main.cpp (282294 => 282295)
--- trunk/Tools/TestWebKitAPI/playstation/main.cpp 2021-09-10 22:16:06 UTC (rev 282294)
+++ trunk/Tools/TestWebKitAPI/playstation/main.cpp 2021-09-10 22:32:43 UTC (rev 282295)
@@ -46,8 +46,12 @@
loadLibraryOrExit("libharfbuzz");
loadLibraryOrExit("libcairo");
loadLibraryOrExit("libSceNKWebKitRequirements");
+#endif
+#if defined(BUILDING_TestWebCore) || defined(BUILDING_TestWebKit) || defined(BUILDING_TestJavaScriptCore)
+#if !ENABLE(STATIC_JSC)
loadLibraryOrExit("libJavaScriptCore");
#endif
+#endif
#if defined(BUILDING_TestWebKit)
if (!((dlopen("libcrypto", RTLD_NOW) && dlopen("libssl", RTLD_NOW)) || dlopen("LibreSSL", RTLD_NOW))) {
fprintf(stderr, "Failed to load SSL library.\n");
