Changeset 198086 in webkit

Timestamp:

Mar 13, 2016 3:30:13 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Added new port JSCOnly.
​https://bugs.webkit.org/show_bug.cgi?id=154512

Patch by Konstantin Tokarev <Konstantin Tokarev> 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):

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/PlatformJSCOnly.cmake (added)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/PlatformJSCOnly.cmake (added)
• Source/WTF/wtf/WorkQueue.h (modified) (4 diffs)
• Source/WTF/wtf/none (added)
• Source/WTF/wtf/none/MainThreadNone.cpp (added)
• Source/WTF/wtf/none/RunLoopNone.cpp (added)
• Source/WTF/wtf/none/WorkQueueNone.cpp (added)
• Source/cmake/OptionsJSCOnly.cmake (added)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-jsc (modified) (1 diff)
• Tools/Scripts/webkitdirs.pm (modified) (9 diffs)

trunk/CMakeLists.txt

@@ -20 +20 @@
 # Determine which port will be built
 # -----------------------------------------------------------------------------
-set(ALL_PORTS Efl GTK AppleWin WinCairo Mac)
+set(ALL_PORTS
+    AppleWin
+    Efl
+    GTK
+    JSCOnly
+    Mac
+    WinCairo
+)
 set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
 

trunk/ChangeLog

@@ +1 @@
+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.
+
 2016-03-12  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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.
+
 2016-03-12  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+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.
+
 2016-03-13  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WTF/wtf/WorkQueue.h

@@ -39 +39 @@
 #endif
 
-#if PLATFORM(GTK)
+#if PLATFORM(EFL)
+#include <DispatchQueueEfl.h>
+#elif USE(GLIB)
 #include <wtf/Condition.h>
 #include <wtf/RunLoop.h>
 #include <wtf/glib/GRefPtr.h>
-#elif PLATFORM(EFL)
-#include <DispatchQueueEfl.h>
 #elif OS(WINDOWS)
 #include <wtf/HashMap.h>
@@ -75 +75 @@
     WTF_EXPORT_PRIVATE static void concurrentApply(size_t iterations, const std::function<void (size_t index)>&);
 
-#if PLATFORM(GTK)
-    RunLoop& runLoop() const { return *m_runLoop; }
-#elif PLATFORM(EFL)
+#if PLATFORM(EFL)
     void registerSocketEventHandler(int, std::function<void ()>);
     void unregisterSocketEventHandler(int);
+#elif USE(GLIB)
+    RunLoop& runLoop() const { return *m_runLoop; }
 #elif OS(DARWIN)
     dispatch_queue_t dispatchQueue() const { return m_dispatchQueue; }
@@ -103 +103 @@
 #endif
 
-#if PLATFORM(GTK)
+#if PLATFORM(EFL)
+    RefPtr<DispatchQueue> m_dispatchQueue;
+#elif USE(GLIB)
     ThreadIdentifier m_workQueueThread;
     Lock m_initializeRunLoopConditionMutex;
@@ -110 +112 @@
     Lock m_terminateRunLoopConditionMutex;
     Condition m_terminateRunLoopCondition;
-#elif PLATFORM(EFL)
-    RefPtr<DispatchQueue> m_dispatchQueue;
 #elif OS(DARWIN)
     static void executeFunction(void*);

trunk/Tools/ChangeLog

@@ +1 @@
+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):
+
 2016-03-13  David Kilzer  <ddkilzer@apple.com>
 

trunk/Tools/Scripts/build-jsc

@@ -43 +43 @@
 my $coverageSupport = 0;
 my $showHelp = 0;
-my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDK() || isX86_64() && (isGtk() || isEfl()));
+my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDK() || isX86_64() && (isGtk() || isEfl() || isJSCOnly()));
 my $forceCLoop = 0;
 my $cli = 0;

trunk/Tools/Scripts/webkitdirs.pm

@@ -102 +102 @@
     iOS      => "iOS",
     Mac      => "Mac",
+    JSCOnly  => "JSCOnly",
     WinCairo => "WinCairo",
     Unknown  => "Unknown"
@@ -449 +450 @@
     push(@args, '--gtk') if isGtk();
     push(@args, '--efl') if isEfl();
+    push(@args, '--jsc-only') if isJSCOnly();
     push(@args, '--wincairo') if isWinCairo();
     push(@args, '--inspector-frontend') if isInspectorFrontend();
@@ -645 +647 @@
 
     my $binaryDirectory;
-    if (isEfl() || isGtk()) {
+    if (isEfl() || isGtk() || isJSCOnly()) {
         $binaryDirectory = "bin";
     } elsif (isAnyWindows()) {
@@ -1046 +1048 @@
         efl => Efl,
         gtk => GTK,
+        'jsc-only' => JSCOnly,
         wincairo => WinCairo
     );
@@ -1076 +1079 @@
                 --efl
                 --gtk
+                --jsc-only
             );
             die "Please specify which WebKit port to build using one of the following options:"
@@ -1101 +1105 @@
 {
     return portName() eq GTK;
+}
+
+sub isJSCOnly()
+{
+    return portName() eq JSCOnly;
 }
 
@@ -1832 +1841 @@
 sub wrapperPrefixIfNeeded()
 {
-    if (isAnyWindows()) {
+    if (isAnyWindows() || isJSCOnly()) {
         return ();
     }
@@ -1985 +1994 @@
     }
 
-    # GTK+ has a production mode, but build-webkit should always use developer mode.
-    push @args, "-DDEVELOPER_MODE=ON" if isEfl() || isGtk();
+    # Some ports have production mode, but build-webkit should always use developer mode.
+    push @args, "-DDEVELOPER_MODE=ON" if isEfl() || isGtk() || isJSCOnly();
 
     # Don't warn variables which aren't used by cmake ports.
@@ -2024 +2033 @@
     push @args, ("--", $makeArgs) if $makeArgs;
 
-    # GTK can use a build script to preserve colors and pretty-printing.
-    if (isGtk() && -e "$buildPath/build.sh") {
+    # GTK and JSCOnly can use a build script to preserve colors and pretty-printing.
+    if ((isGtk() || isJSCOnly()) && -e "$buildPath/build.sh") {
         chdir "$buildPath" or die;
         $command = "$buildPath/build.sh";