<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281730] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281730">281730</a></dd>
<dt>Author</dt> <dd>stephan.szabo@sony.com</dd>
<dt>Date</dt> <dd>2021-08-27 19:09:00 -0700 (Fri, 27 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[PlayStation][CMake] Add control over whether JavaScriptCore should be shared
https://bugs.webkit.org/show_bug.cgi?id=229591

.:

Add option for controlling whether to build a shared JavaScriptCore and
set build type for that appropriately.

Reviewed by Don Olmstead.

* Source/cmake/OptionsPlayStation.cmake:

Source/JavaScriptCore:

Reviewed by Don Olmstead.

Make LowLevelInterpreterLib objects get added via _PRIVATE_LIBRARIES when
using JavaScriptCore as an object library in order to propogate them
correctly.

* CMakeLists.txt:

Tools:

Reviewed by Don Olmstead.

Add frameworks to test applications to build with an object library version
of JavaScriptCore.

* TestWebKitAPI/CMakeLists.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeOptionsPlayStationcmake">trunk/Source/cmake/OptionsPlayStation.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPICMakeListstxt">trunk/Tools/TestWebKitAPI/CMakeLists.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (281729 => 281730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog  2021-08-28 00:57:09 UTC (rev 281729)
+++ trunk/ChangeLog     2021-08-28 02:09:00 UTC (rev 281730)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-08-27  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [PlayStation][CMake] Add control over whether JavaScriptCore should be shared
+        https://bugs.webkit.org/show_bug.cgi?id=229591
+
+        Add option for controlling whether to build a shared JavaScriptCore and
+        set build type for that appropriately.
+
+        Reviewed by Don Olmstead.
+
+        * Source/cmake/OptionsPlayStation.cmake:
+
</ins><span class="cx"> 2021-08-27  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Land Windows build fixes from safari-612.1.29.14-branch.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (281729 => 281730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt       2021-08-28 00:57:09 UTC (rev 281729)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt  2021-08-28 02:09:00 UTC (rev 281730)
</span><span class="lines">@@ -1454,7 +1454,13 @@
</span><span class="cx">         COMPILE_DEFINITIONS "POSTPROCESS_ASM=llint/LowLevelInterpreter.cpp")
</span><span class="cx"> endif ()
</span><span class="cx"> 
</span><del>-list(APPEND JavaScriptCore_SOURCES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
</del><ins>+# When building JavaScriptCore as an object library, we need to make sure the
+# lowlevelinterpreter lib objects get propogated.
+if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "OBJECT")
+    list(APPEND JavaScriptCore_PRIVATE_LIBRARIES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
+else ()
+    list(APPEND JavaScriptCore_SOURCES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
+endif ()
</ins><span class="cx"> 
</span><span class="cx"> WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
</span><span class="cx"> WEBKIT_FRAMEWORK(JavaScriptCore)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (281729 => 281730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-08-28 00:57:09 UTC (rev 281729)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-08-28 02:09:00 UTC (rev 281730)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-08-27  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [PlayStation][CMake] Add control over whether JavaScriptCore should be shared
+        https://bugs.webkit.org/show_bug.cgi?id=229591
+
+        Reviewed by Don Olmstead.
+
+        Make LowLevelInterpreterLib objects get added via _PRIVATE_LIBRARIES when
+        using JavaScriptCore as an object library in order to propogate them
+        correctly.
+
+        * CMakeLists.txt:
+
</ins><span class="cx"> 2021-08-27  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Land Windows build fixes from safari-612.1.29.14-branch.
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsPlayStationcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsPlayStation.cmake (281729 => 281730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsPlayStation.cmake      2021-08-28 00:57:09 UTC (rev 281729)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2021-08-28 02:09:00 UTC (rev 281730)
</span><span class="lines">@@ -28,6 +28,9 @@
</span><span class="cx"> 
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx"> 
</span><ins>+# PlayStation Specific Options
+WEBKIT_OPTION_DEFINE(ENABLE_STATIC_JSC "Control whether to build a non-shared JSC" PUBLIC ON)
+
</ins><span class="cx"> # Turn off JIT
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE OFF)
</span><span class="lines">@@ -174,8 +177,13 @@
</span><span class="cx"> # not be exposed.
</span><span class="cx"> set(bmalloc_LIBRARY_TYPE OBJECT)
</span><span class="cx"> set(WTF_LIBRARY_TYPE OBJECT)
</span><del>-set(JavaScriptCore_LIBRARY_TYPE SHARED)
</del><span class="cx"> 
</span><ins>+if (ENABLE_STATIC_JSC)
+    set(JavaScriptCore_LIBRARY_TYPE OBJECT)
+else ()
+    set(JavaScriptCore_LIBRARY_TYPE SHARED)
+endif ()
+
</ins><span class="cx"> # Create a shared WebKit
</span><span class="cx"> #
</span><span class="cx"> # Use OBJECT libraries for PAL and WebCore. The size of a libWebCore.a is too much
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (281729 => 281730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-08-28 00:57:09 UTC (rev 281729)
+++ trunk/Tools/ChangeLog       2021-08-28 02:09:00 UTC (rev 281730)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-08-27  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [PlayStation][CMake] Add control over whether JavaScriptCore should be shared
+        https://bugs.webkit.org/show_bug.cgi?id=229591
+
+        Reviewed by Don Olmstead.
+
+        Add frameworks to test applications to build with an object library version
+        of JavaScriptCore.
+
+        * TestWebKitAPI/CMakeLists.txt:
+
</ins><span class="cx"> 2021-08-27  Ryan Haddad  <ryanhaddad@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [EWS] Do not notify Apple bot watchers about failures seen on Igalia bots
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPICMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (281729 => 281730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2021-08-28 00:57:09 UTC (rev 281729)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt    2021-08-28 02:09:00 UTC (rev 281730)
</span><span class="lines">@@ -148,6 +148,9 @@
</span><span class="cx">         JavaScriptCore
</span><span class="cx">         WTF
</span><span class="cx">     )
</span><ins>+    if (NOT USE_SYSTEM_MALLOC)
+        list(APPEND TestJavaScriptCore_FRAMEWORKS bmalloc)
+    endif ()
</ins><span class="cx"> 
</span><span class="cx">     set(TestJavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
</span><span class="cx">         ${CMAKE_BINARY_DIR}
</span><span class="lines">@@ -197,9 +200,14 @@
</span><span class="cx">         WebKit::gtest
</span><span class="cx">     )
</span><span class="cx">     set(TestWebCore_FRAMEWORKS
</span><ins>+        JavaScriptCore
</ins><span class="cx">         PAL
</span><ins>+        WTF
</ins><span class="cx">         WebCore
</span><span class="cx">     )
</span><ins>+    if (NOT USE_SYSTEM_MALLOC)
+        list(APPEND TestWebCore_FRAMEWORKS bmalloc)
+    endif ()
</ins><span class="cx"> 
</span><span class="cx">     set(TestWebCore_PRIVATE_INCLUDE_DIRECTORIES
</span><span class="cx">         ${CMAKE_BINARY_DIR}
</span></span></pre>
</div>
</div>

</body>
</html>