Attachment 343797 Details for Bug 187133 – Patch

[patch] Patch

bug-187133-20180627233816.patch (text/plain), 5.36 KB, created by Adam Barth on 2018-06-27 23:38:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Barth

Created: 2018-06-27 23:38:17 PDT

Size: 5.36 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>--- ChangeLog	(revision 233297)
>+++ ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2018-06-27  Adam Barth  <abarth@webkit.org>
>+
>+        Switch OS(FUCHSIA) to using JSCOnly
>+        https://bugs.webkit.org/show_bug.cgi?id=187133
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rather than creating a Fuchsia port, OS(FUCHSIA) now uses the JSCOnly
>+        port.
>+
>+        * CMakeLists.txt: Set the WTF_OS_FUCHSIA flag
>+        * Source/cmake/OptionsFuchsia.cmake: Removed.
>+        * Source/cmake/OptionsJSCOnly.cmake: Temporarily disable ICU for
>+        OS(FUCHSIA). We'll get ICU wired in, but I'd like to work through the
>+        other compile errors first.
>+
> 2018-06-27  Adam Barth  <abarth@webkit.org>
> 
>         Add Fuchsia support to build-jsc
>Index: CMakeLists.txt
>===================================================================
>--- CMakeLists.txt	(revision 233297)
>+++ CMakeLists.txt	(working copy)
>@@ -37,7 +37,6 @@ endif ()
> set(ALL_PORTS
>     AppleWin
>     Efl
>-    Fuchsia
>     GTK
>     JSCOnly
>     Mac
>@@ -115,6 +114,8 @@ if (UNIX)
>     endif ()
> elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
>     set(WTF_OS_WINDOWS 1)
>+elseif (CMAKE_SYSTEM_NAME MATCHES "Fuchsia")
>+    set(WTF_OS_FUCHSIA 1)
> else ()
>     message(FATAL_ERROR "Unknown OS '${CMAKE_SYSTEM_NAME}'")
> endif ()
>Index: Source/cmake/OptionsFuchsia.cmake
>===================================================================
>--- Source/cmake/OptionsFuchsia.cmake	(revision 233297)
>+++ Source/cmake/OptionsFuchsia.cmake	(nonexistent)
>@@ -1,29 +0,0 @@
>-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})
>-
>-set(CMAKE_SYSTEM_NAME Fuchsia)
>-
>-if (WTF_CPU_ARM64)
>-    set(triple aarch64-unknown-fuchsia)
>-elseif (WTF_CPU_X86_64)
>-    set(triple x86_64-unknown-fuchsia)
>-else ()
>-    message(FATAL_ERROR "Unknown ARCH '${CMAKE_SYSTEM_PROCESSOR}'")
>-endif ()
>-
>-set(CMAKE_C_COMPILER_TARGET ${triple})
>-set(CMAKE_CXX_COMPILER_TARGET ${triple})
>-
>-WEBKIT_OPTION_BEGIN()
>-WEBKIT_OPTION_DEFINE(ENABLE_STATIC_JSC "Whether to build JavaScriptCore as a static library." PUBLIC OFF)
>-WEBKIT_OPTION_END()
>-
>-set(ENABLE_WEBCORE OFF)
>-set(ENABLE_WEBKIT_LEGACY OFF)
>-set(ENABLE_WEBKIT OFF)
>-set(ENABLE_API_TESTS OFF)
>-
>-SET_AND_EXPOSE_TO_BUILD(USE_GENERIC_EVENT_LOOP 1)
>-SET_AND_EXPOSE_TO_BUILD(WTF_DEFAULT_EVENT_LOOP 0)
>Index: Source/cmake/OptionsJSCOnly.cmake
>===================================================================
>--- Source/cmake/OptionsJSCOnly.cmake	(revision 233297)
>+++ Source/cmake/OptionsJSCOnly.cmake	(working copy)
>@@ -97,7 +97,10 @@ else ()
> endif ()
> 
> if (NOT APPLE)
>-    find_package(ICU REQUIRED)
>+    if (NOT WTF_OS_FUCHSIA)
>+        # TODO: Add ICU on Fuchsia.
>+        find_package(ICU REQUIRED)
>+    endif ()
> else ()
>     add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
>     set(ICU_LIBRARIES libicucore.dylib)
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 233300)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,25 @@
>+2018-06-27  Adam Barth  <abarth@webkit.org>
>+
>+        Switch OS(FUCHSIA) to using JSCOnly
>+        https://bugs.webkit.org/show_bug.cgi?id=187133
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Switch Fuchsia from being a port to just being an OS. We now use a
>+        CMAKE_TOOLCHAIN_FILE to configure the toolchain and the target triple.
>+
>+        * Scripts/webkitdirs.pm:
>+        (determineSourceDir):
>+        (determineXcodeSDK):
>+        (findMatchingArguments):
>+        (determinePortName):
>+        (determineIfTargetingFuchsia):
>+        (isFuchsia):
>+        (setupAppleWinEnv):
>+        (generateBuildSystemFromCMakeProject):
>+        (relaunchIOSSimulator):
>+        (debugMiniBrowser):
>+
> 2018-06-27  Daniel Bates  <dabates@apple.com>
> 
>         Add some tests for lldb_webkit.py
>Index: Tools/Scripts/webkitdirs.pm
>===================================================================
>--- Tools/Scripts/webkitdirs.pm	(revision 233297)
>+++ Tools/Scripts/webkitdirs.pm	(working copy)
>@@ -104,7 +104,6 @@ BEGIN {
> # Ports
> use constant {
>     AppleWin => "AppleWin",
>-    Fuchsia  => "Fuchsia",
>     GTK      => "GTK",
>     iOS      => "iOS",
>     tvOS     => "tvOS",
>@@ -477,7 +476,6 @@ sub argumentsForConfiguration()
>     push(@args, '--ios-simulator') if (defined $xcodeSDK && $xcodeSDK =~ /^iphonesimulator/);
>     push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
>     push(@args, '--64-bit') if (isWin64());
>-    push(@args, '--fuchsia') if isFuchsia();
>     push(@args, '--gtk') if isGtk();
>     push(@args, '--wpe') if isWPE();
>     push(@args, '--jsc-only') if isJSCOnly();
>@@ -1191,7 +1189,6 @@ sub determinePortName()
>     return if defined $portName;
> 
>     my %argToPortName = (
>-        fuchsia => Fuchsia,
>         gtk => GTK,
>         'jsc-only' => JSCOnly,
>         wincairo => WinCairo,
>@@ -1247,11 +1244,6 @@ sub portName()
>     return $portName;
> }
> 
>-sub isFuchsia()
>-{
>-    return portName() eq Fuchsia;
>-}
>-
> sub isGtk()
> {
>     return portName() eq GTK;
>@@ -2031,7 +2023,7 @@ sub isCachedArgumentfileOutOfDate($@)
> 
> sub wrapperPrefixIfNeeded()
> {
>-    if (isAnyWindows() || isJSCOnly() || isFuchsia()) {
>+    if (isAnyWindows() || isJSCOnly()) {
>         return ();
>     }
>     if (isAppleCocoaWebKit()) {

Actions: View | Formatted Diff | Diff

Attachments on bug 187133: 343792 | 343797 | 343799