<!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>[198086] 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/198086">198086</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-13 15:30:13 -0700 (Sun, 13 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added new port JSCOnly.
https://bugs.webkit.org/show_bug.cgi?id=154512
Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-03-13
Reviewed by Michael Catanzaro.
This port allows to build JavaScriptCore engine with minimal
dependencies.
.:
* CMakeLists.txt:
* Source/cmake/OptionsJSCOnly.cmake: Added.
Source/JavaScriptCore:
* PlatformJSCOnly.cmake: Added.
Source/WTF:
* wtf/PlatformJSCOnly.cmake: Added.
* wtf/none/MainThreadNone.cpp: Added.
* wtf/none/RunLoopNone.cpp: Added.
* wtf/none/WorkQueueNone.cpp: Added.
Tools:
* Scripts/build-jsc:
* Scripts/webkitdirs.pm:
(argumentsForConfiguration):
(executableProductDir):
(determinePortName):
(isJSCOnly):
(wrapperPrefixIfNeeded):
(generateBuildSystemFromCMakeProject):
(buildCMakeGeneratedProject):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfWorkQueueh">trunk/Source/WTF/wtf/WorkQueue.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildjsc">trunk/Tools/Scripts/build-jsc</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorePlatformJSCOnlycmake">trunk/Source/JavaScriptCore/PlatformJSCOnly.cmake</a></li>
<li><a href="#trunkSourceWTFwtfPlatformJSCOnlycmake">trunk/Source/WTF/wtf/PlatformJSCOnly.cmake</a></li>
<li>trunk/Source/WTF/wtf/none/</li>
<li><a href="#trunkSourceWTFwtfnoneMainThreadNonecpp">trunk/Source/WTF/wtf/none/MainThreadNone.cpp</a></li>
<li><a href="#trunkSourceWTFwtfnoneRunLoopNonecpp">trunk/Source/WTF/wtf/none/RunLoopNone.cpp</a></li>
<li><a href="#trunkSourceWTFwtfnoneWorkQueueNonecpp">trunk/Source/WTF/wtf/none/WorkQueueNone.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsJSCOnlycmake">trunk/Source/cmake/OptionsJSCOnly.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (198085 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2016-03-13 22:28:11 UTC (rev 198085)
+++ trunk/CMakeLists.txt 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -19,7 +19,14 @@
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> # Determine which port will be built
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-set(ALL_PORTS Efl GTK AppleWin WinCairo Mac)
</del><ins>+set(ALL_PORTS
+ AppleWin
+ Efl
+ GTK
+ JSCOnly
+ Mac
+ WinCairo
+)
</ins><span class="cx"> set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
</span><span class="cx">
</span><span class="cx"> list(FIND ALL_PORTS ${PORT} RET)
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (198085 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-03-13 22:28:11 UTC (rev 198085)
+++ trunk/ChangeLog 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-13 Konstantin Tokarev <annulen@yandex.ru>
+
+ Added new port JSCOnly.
+ https://bugs.webkit.org/show_bug.cgi?id=154512
+
+ Reviewed by Michael Catanzaro.
+
+ This port allows to build JavaScriptCore engine with minimal
+ dependencies.
+
+ * CMakeLists.txt:
+ * Source/cmake/OptionsJSCOnly.cmake: Added.
+
</ins><span class="cx"> 2016-03-12 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Delete dead SVG Font code
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198085 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-13 22:28:11 UTC (rev 198085)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-13 Konstantin Tokarev <annulen@yandex.ru>
+
+ Added new port JSCOnly.
+ https://bugs.webkit.org/show_bug.cgi?id=154512
+
+ Reviewed by Michael Catanzaro.
+
+ This port allows to build JavaScriptCore engine with minimal
+ dependencies.
+
+ * PlatformJSCOnly.cmake: Added.
+
</ins><span class="cx"> 2016-03-12 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> http://kangax.github.io/compat-table/esnext/ crashes reliably.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformJSCOnlycmake"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/PlatformJSCOnly.cmake (0 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformJSCOnly.cmake (rev 0)
+++ trunk/Source/JavaScriptCore/PlatformJSCOnly.cmake 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
+
+list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+ "${WTF_DIR}"
+)
+
+if (USE_GLIB)
+ list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${GLIB_INCLUDE_DIRS}
+ )
+ list(APPEND JavaScriptCore_LIBRARIES
+ ${GLIB_LIBRARIES}
+ )
+endif ()
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (198085 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-03-13 22:28:11 UTC (rev 198085)
+++ trunk/Source/WTF/ChangeLog 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-13 Konstantin Tokarev <annulen@yandex.ru>
+
+ Added new port JSCOnly.
+ https://bugs.webkit.org/show_bug.cgi?id=154512
+
+ Reviewed by Michael Catanzaro.
+
+ This port allows to build JavaScriptCore engine with minimal
+ dependencies.
+
+ * wtf/PlatformJSCOnly.cmake: Added.
+ * wtf/none/MainThreadNone.cpp: Added.
+ * wtf/none/RunLoopNone.cpp: Added.
+ * wtf/none/WorkQueueNone.cpp: Added.
+
</ins><span class="cx"> 2016-03-13 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r198079): Windows build broke because of "%PRId64" format specifier
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformJSCOnlycmake"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/PlatformJSCOnly.cmake (0 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformJSCOnly.cmake (rev 0)
+++ trunk/Source/WTF/wtf/PlatformJSCOnly.cmake 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+if (LOWERCASE_EVENTLOOP_TYPE STREQUAL "glib")
+ list(APPEND WTF_SOURCES
+ glib/GRefPtr.cpp
+ glib/MainThreadGLib.cpp
+ glib/RunLoopGLib.cpp
+ glib/WorkQueueGLib.cpp
+ )
+ list(APPEND WTF_SYSTEM_INCLUDE_DIRECTORIES
+ ${GLIB_INCLUDE_DIRS}
+ )
+ list(APPEND WTF_LIBRARIES
+ ${GLIB_GIO_LIBRARIES}
+ ${GLIB_GOBJECT_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ )
+else ()
+ list(APPEND WTF_SOURCES
+ none/MainThreadNone.cpp
+ none/RunLoopNone.cpp
+ none/WorkQueueNone.cpp
+ )
+endif ()
+
+list(APPEND WTF_LIBRARIES
+ ${CMAKE_THREAD_LIBS_INIT}
+)
</ins></span></pre></div>
<a id="trunkSourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WorkQueue.h (198085 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2016-03-13 22:28:11 UTC (rev 198085)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -38,12 +38,12 @@
</span><span class="cx"> #include <dispatch/dispatch.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(GTK)
</del><ins>+#if PLATFORM(EFL)
+#include <DispatchQueueEfl.h>
+#elif USE(GLIB)
</ins><span class="cx"> #include <wtf/Condition.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><del>-#elif PLATFORM(EFL)
-#include <DispatchQueueEfl.h>
</del><span class="cx"> #elif OS(WINDOWS)
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -74,11 +74,11 @@
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE static void concurrentApply(size_t iterations, const std::function<void (size_t index)>&);
</span><span class="cx">
</span><del>-#if PLATFORM(GTK)
- RunLoop& runLoop() const { return *m_runLoop; }
-#elif PLATFORM(EFL)
</del><ins>+#if PLATFORM(EFL)
</ins><span class="cx"> void registerSocketEventHandler(int, std::function<void ()>);
</span><span class="cx"> void unregisterSocketEventHandler(int);
</span><ins>+#elif USE(GLIB)
+ RunLoop& runLoop() const { return *m_runLoop; }
</ins><span class="cx"> #elif OS(DARWIN)
</span><span class="cx"> dispatch_queue_t dispatchQueue() const { return m_dispatchQueue; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -102,15 +102,15 @@
</span><span class="cx"> static DWORD WINAPI unregisterWaitAndDestroyItemCallback(void* context);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(GTK)
</del><ins>+#if PLATFORM(EFL)
+ RefPtr<DispatchQueue> m_dispatchQueue;
+#elif USE(GLIB)
</ins><span class="cx"> ThreadIdentifier m_workQueueThread;
</span><span class="cx"> Lock m_initializeRunLoopConditionMutex;
</span><span class="cx"> Condition m_initializeRunLoopCondition;
</span><span class="cx"> RunLoop* m_runLoop;
</span><span class="cx"> Lock m_terminateRunLoopConditionMutex;
</span><span class="cx"> Condition m_terminateRunLoopCondition;
</span><del>-#elif PLATFORM(EFL)
- RefPtr<DispatchQueue> m_dispatchQueue;
</del><span class="cx"> #elif OS(DARWIN)
</span><span class="cx"> static void executeFunction(void*);
</span><span class="cx"> dispatch_queue_t m_dispatchQueue;
</span></span></pre></div>
<a id="trunkSourceWTFwtfnoneMainThreadNonecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/none/MainThreadNone.cpp (0 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/none/MainThreadNone.cpp (rev 0)
+++ trunk/Source/WTF/wtf/none/MainThreadNone.cpp 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2016 Konstantin Tokavev <annulen@yandex.ru>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "MainThread.h"
+
+namespace WTF {
+
+void initializeMainThreadPlatform()
+{
+}
+
+void scheduleDispatchFunctionsOnMainThread()
+{
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWTFwtfnoneRunLoopNonecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/none/RunLoopNone.cpp (0 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/none/RunLoopNone.cpp (rev 0)
+++ trunk/Source/WTF/wtf/none/RunLoopNone.cpp 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+/*
+ * Copyright (C) 2016 Konstantin Tokavev <annulen@yandex.ru>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "RunLoop.h"
+
+namespace WTF {
+
+RunLoop::RunLoop()
+{
+}
+
+RunLoop::~RunLoop()
+{
+}
+
+void RunLoop::run()
+{
+}
+
+void RunLoop::stop()
+{
+}
+
+void RunLoop::wakeUp()
+{
+ ASSERT_NOT_REACHED();
+}
+
+RunLoop::TimerBase::TimerBase(RunLoop& runLoop)
+ : m_runLoop(runLoop)
+{
+}
+
+RunLoop::TimerBase::~TimerBase()
+{
+ stop();
+}
+
+void RunLoop::TimerBase::start(double, bool)
+{
+}
+
+void RunLoop::TimerBase::stop()
+{
+}
+
+bool RunLoop::TimerBase::isActive() const
+{
+ return false;
+}
+
+} // namespace WTF
</ins></span></pre></div>
<a id="trunkSourceWTFwtfnoneWorkQueueNonecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/none/WorkQueueNone.cpp (0 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/none/WorkQueueNone.cpp (rev 0)
+++ trunk/Source/WTF/wtf/none/WorkQueueNone.cpp 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+/*
+ * Copyright (C) 2016 Konstantin Tokavev <annulen@yandex.ru>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WorkQueue.h"
+
+void WorkQueue::platformInitialize(const char*, Type, QOS)
+{
+}
+
+void WorkQueue::platformInvalidate()
+{
+}
+
+void WorkQueue::dispatch(std::function<void()>)
+{
+ ASSERT_NOT_REACHED();
+}
+
+void WorkQueue::dispatchAfter(std::chrono::nanoseconds, std::function<void()>)
+{
+ ASSERT_NOT_REACHED();
+}
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsJSCOnlycmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/OptionsJSCOnly.cmake (0 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsJSCOnly.cmake (rev 0)
+++ trunk/Source/cmake/OptionsJSCOnly.cmake 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+find_package(ICU REQUIRED)
+find_package(Threads REQUIRED)
+
+set(PROJECT_VERSION_MAJOR 1)
+set(PROJECT_VERSION_MINOR 0)
+set(PROJECT_VERSION_MICRO 0)
+set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
+
+WEBKIT_OPTION_BEGIN()
+WEBKIT_OPTION_DEFINE(ENABLE_STATIC_JSC "Whether to build JavaScriptCore as a static library." PUBLIC OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC ON)
+WEBKIT_OPTION_END()
+
+set(ALL_EVENTLOOP_TYPES
+ GLib
+ None
+)
+
+if (UNIX AND NOT APPLE)
+ set(DEFAULT_EVENTLOOP_TYPE "GLib")
+else ()
+ # TODO: Use native Mac and Win implementations
+ set(DEFAULT_EVENTLOOP_TYPE "None")
+endif ()
+
+set(EVENTLOOP_TYPE ${DEFAULT_EVENTLOOP_TYPE} CACHE STRING "Implementation of event loop to be used in JavaScriptCore (one of ${ALL_EVENTLOOP_TYPES})")
+
+set(ENABLE_WEBKIT OFF)
+set(ENABLE_WEBKIT2 OFF)
+set(ENABLE_API_TESTS OFF)
+
+if (WTF_CPU_X86 OR WTF_CPU_X86_64)
+ set(WTF_USE_UDIS86 1)
+endif ()
+
+if (ENABLE_STATIC_JSC)
+ set(JavaScriptCore_LIBRARY_TYPE STATIC)
+endif ()
+
+string(TOLOWER ${EVENTLOOP_TYPE} LOWERCASE_EVENTLOOP_TYPE)
+if (LOWERCASE_EVENTLOOP_TYPE STREQUAL "glib")
+ find_package(GLIB 2.36 REQUIRED COMPONENTS gio gobject)
+ SET_AND_EXPOSE_TO_BUILD(USE_GLIB 1)
+endif ()
+
+# From OptionsGTK.cmake
+if (CMAKE_MAJOR_VERSION LESS 3)
+ # Before CMake 3 it was necessary to use a build script instead of using cmake --build directly
+ # to preserve colors and pretty-printing.
+
+ build_command(COMMAND_LINE_TO_BUILD)
+ # build_command unconditionally adds -i (ignore errors) for make, and there's
+ # no reasonable way to turn that off, so we just replace it with -k, which has
+ # the same effect, except that the return code will indicate that an error occurred.
+ # See: http://www.cmake.org/cmake/help/v3.0/command/build_command.html
+ string(REPLACE " -i" " -k" COMMAND_LINE_TO_BUILD ${COMMAND_LINE_TO_BUILD})
+ file(WRITE
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build.sh
+ "#!/bin/sh\n"
+ "${COMMAND_LINE_TO_BUILD} $@"
+ )
+ file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build.sh
+ DESTINATION ${CMAKE_BINARY_DIR}
+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+ )
+endif ()
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198085 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-13 22:28:11 UTC (rev 198085)
+++ trunk/Tools/ChangeLog 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-03-13 Konstantin Tokarev <annulen@yandex.ru>
+
+ Added new port JSCOnly.
+ https://bugs.webkit.org/show_bug.cgi?id=154512
+
+ Reviewed by Michael Catanzaro.
+
+ This port allows to build JavaScriptCore engine with minimal
+ dependencies.
+
+ * Scripts/build-jsc:
+ * Scripts/webkitdirs.pm:
+ (argumentsForConfiguration):
+ (executableProductDir):
+ (determinePortName):
+ (isJSCOnly):
+ (wrapperPrefixIfNeeded):
+ (generateBuildSystemFromCMakeProject):
+ (buildCMakeGeneratedProject):
+
</ins><span class="cx"> 2016-03-13 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> TestWebKitAPI: fix linker warnings
</span></span></pre></div>
<a id="trunkToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-jsc (198085 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-jsc 2016-03-13 22:28:11 UTC (rev 198085)
+++ trunk/Tools/Scripts/build-jsc 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> my $shouldRunStaticAnalyzer = 0;
</span><span class="cx"> my $coverageSupport = 0;
</span><span class="cx"> my $showHelp = 0;
</span><del>-my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDK() || isX86_64() && (isGtk() || isEfl()));
</del><ins>+my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDK() || isX86_64() && (isGtk() || isEfl() || isJSCOnly()));
</ins><span class="cx"> my $forceCLoop = 0;
</span><span class="cx"> my $cli = 0;
</span><span class="cx"> my $makeArgs = "";
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (198085 => 198086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2016-03-13 22:28:11 UTC (rev 198085)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-03-13 22:30:13 UTC (rev 198086)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> Efl => "Efl",
</span><span class="cx"> iOS => "iOS",
</span><span class="cx"> Mac => "Mac",
</span><ins>+ JSCOnly => "JSCOnly",
</ins><span class="cx"> WinCairo => "WinCairo",
</span><span class="cx"> Unknown => "Unknown"
</span><span class="cx"> };
</span><span class="lines">@@ -448,6 +449,7 @@
</span><span class="cx"> push(@args, '--64-bit') if (isWin64());
</span><span class="cx"> push(@args, '--gtk') if isGtk();
</span><span class="cx"> push(@args, '--efl') if isEfl();
</span><ins>+ push(@args, '--jsc-only') if isJSCOnly();
</ins><span class="cx"> push(@args, '--wincairo') if isWinCairo();
</span><span class="cx"> push(@args, '--inspector-frontend') if isInspectorFrontend();
</span><span class="cx"> return @args;
</span><span class="lines">@@ -644,7 +646,7 @@
</span><span class="cx"> my $productDirectory = productDir();
</span><span class="cx">
</span><span class="cx"> my $binaryDirectory;
</span><del>- if (isEfl() || isGtk()) {
</del><ins>+ if (isEfl() || isGtk() || isJSCOnly()) {
</ins><span class="cx"> $binaryDirectory = "bin";
</span><span class="cx"> } elsif (isAnyWindows()) {
</span><span class="cx"> $binaryDirectory = isWin64() ? "bin64" : "bin32";
</span><span class="lines">@@ -1045,6 +1047,7 @@
</span><span class="cx"> my %argToPortName = (
</span><span class="cx"> efl => Efl,
</span><span class="cx"> gtk => GTK,
</span><ins>+ 'jsc-only' => JSCOnly,
</ins><span class="cx"> wincairo => WinCairo
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -1075,6 +1078,7 @@
</span><span class="cx"> my $portsChoice = join "\n\t", qw(
</span><span class="cx"> --efl
</span><span class="cx"> --gtk
</span><ins>+ --jsc-only
</ins><span class="cx"> );
</span><span class="cx"> die "Please specify which WebKit port to build using one of the following options:"
</span><span class="cx"> . "\n\t$portsChoice\n";
</span><span class="lines">@@ -1102,6 +1106,11 @@
</span><span class="cx"> return portName() eq GTK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub isJSCOnly()
+{
+ return portName() eq JSCOnly;
+}
+
</ins><span class="cx"> # Determine if this is debian, ubuntu, linspire, or something similar.
</span><span class="cx"> sub isDebianBased()
</span><span class="cx"> {
</span><span class="lines">@@ -1831,7 +1840,7 @@
</span><span class="cx">
</span><span class="cx"> sub wrapperPrefixIfNeeded()
</span><span class="cx"> {
</span><del>- if (isAnyWindows()) {
</del><ins>+ if (isAnyWindows() || isJSCOnly()) {
</ins><span class="cx"> return ();
</span><span class="cx"> }
</span><span class="cx"> if (isAppleMacWebKit()) {
</span><span class="lines">@@ -1984,8 +1993,8 @@
</span><span class="cx"> push @args, '-G "Visual Studio 14 2015 Win64"';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # GTK+ has a production mode, but build-webkit should always use developer mode.
- push @args, "-DDEVELOPER_MODE=ON" if isEfl() || isGtk();
</del><ins>+ # Some ports have production mode, but build-webkit should always use developer mode.
+ push @args, "-DDEVELOPER_MODE=ON" if isEfl() || isGtk() || isJSCOnly();
</ins><span class="cx">
</span><span class="cx"> # Don't warn variables which aren't used by cmake ports.
</span><span class="cx"> push @args, "--no-warn-unused-cli";
</span><span class="lines">@@ -2023,8 +2032,8 @@
</span><span class="cx"> my @args = ("--build", $buildPath, "--config", $config);
</span><span class="cx"> push @args, ("--", $makeArgs) if $makeArgs;
</span><span class="cx">
</span><del>- # GTK can use a build script to preserve colors and pretty-printing.
- if (isGtk() && -e "$buildPath/build.sh") {
</del><ins>+ # GTK and JSCOnly can use a build script to preserve colors and pretty-printing.
+ if ((isGtk() || isJSCOnly()) && -e "$buildPath/build.sh") {
</ins><span class="cx"> chdir "$buildPath" or die;
</span><span class="cx"> $command = "$buildPath/build.sh";
</span><span class="cx"> @args = ($makeArgs);
</span></span></pre>
</div>
</div>
</body>
</html>