From e1e42f5f589f8620f598e5d67adb38ae7a29581b Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Tue, 27 Feb 2024 18:44:23 -0500 Subject: [PATCH] Meta: Port recent changes to the GN build f9e5b43b7a3a4e45a2753cc6ea9742c3d431e266 b9dc2d7ebf0f6cac79dd9fa5b69ec718e899d2d2 fa692ae3f6d6e77497151396c3944a9541607384 --- Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn | 2 ++ Meta/gn/secondary/Userland/Libraries/LibJS/BUILD.gn | 1 + Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn | 2 +- .../Userland/Libraries/LibWeb/{URL => DOMURL}/BUILD.gn | 4 ++-- Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni | 4 ++-- 5 files changed, 8 insertions(+), 5 deletions(-) rename Meta/gn/secondary/Userland/Libraries/LibWeb/{URL => DOMURL}/BUILD.gn (82%) diff --git a/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn index 38cc7da0d2..a5b1586db0 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn @@ -22,6 +22,8 @@ source_set("sources") { "DirectoryEntry.h", "ElapsedTimer.cpp", "ElapsedTimer.h", + "Environment.cpp", + "Environment.h", "Event.cpp", "Event.h", "EventLoop.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibJS/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibJS/BUILD.gn index bcb0ff0c18..e7218544ef 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibJS/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibJS/BUILD.gn @@ -261,6 +261,7 @@ shared_library("LibJS") { "Runtime/Temporal/Temporal.cpp", "Runtime/Temporal/TimeZone.cpp", "Runtime/Temporal/TimeZoneConstructor.cpp", + "Runtime/Temporal/TimeZoneMethods.cpp", "Runtime/Temporal/TimeZonePrototype.cpp", "Runtime/Temporal/ZonedDateTime.cpp", "Runtime/Temporal/ZonedDateTimeConstructor.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn index 3d06e9babe..956019dd64 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn @@ -320,6 +320,7 @@ shared_library("LibWeb") { "Crypto", "DOM", "DOMParsing", + "DOMURL", "Encoding", "Fetch", "FileAPI", @@ -348,7 +349,6 @@ shared_library("LibWeb") { "Selection", "Streams", "UIEvents", - "URL", "UserTiming", "WebAssembly", "WebDriver", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/URL/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/DOMURL/BUILD.gn similarity index 82% rename from Meta/gn/secondary/Userland/Libraries/LibWeb/URL/BUILD.gn rename to Meta/gn/secondary/Userland/Libraries/LibWeb/DOMURL/BUILD.gn index 73babc2a6d..d199fe9dee 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/URL/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/DOMURL/BUILD.gn @@ -1,8 +1,8 @@ -source_set("URL") { +source_set("DOMURL") { configs += [ "//Userland/Libraries/LibWeb:configs" ] deps = [ "//Userland/Libraries/LibWeb:all_generated" ] sources = [ - "URL.cpp", + "DOMURL.cpp", "URLSearchParams.cpp", "URLSearchParamsIterator.cpp", ] diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni b/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni index 4d0e1e7b98..d28de606f4 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/idl_files.gni @@ -6,7 +6,7 @@ iterable_idl_files = [ "//Userland/Libraries/LibWeb/Fetch/Headers.idl", - "//Userland/Libraries/LibWeb/URL/URLSearchParams.idl", + "//Userland/Libraries/LibWeb/DOMURL/URLSearchParams.idl", "//Userland/Libraries/LibWeb/XHR/FormData.idl", ] @@ -86,6 +86,7 @@ standard_idl_files = [ "//Userland/Libraries/LibWeb/DOM/TreeWalker.idl", "//Userland/Libraries/LibWeb/DOM/XMLDocument.idl", "//Userland/Libraries/LibWeb/DOMParsing/XMLSerializer.idl", + "//Userland/Libraries/LibWeb/DOMURL/DOMURL.idl", "//Userland/Libraries/LibWeb/Encoding/TextDecoder.idl", "//Userland/Libraries/LibWeb/Encoding/TextEncoder.idl", "//Userland/Libraries/LibWeb/Fetch/Request.idl", @@ -286,7 +287,6 @@ standard_idl_files = [ "//Userland/Libraries/LibWeb/UIEvents/MouseEvent.idl", "//Userland/Libraries/LibWeb/UIEvents/UIEvent.idl", "//Userland/Libraries/LibWeb/UIEvents/WheelEvent.idl", - "//Userland/Libraries/LibWeb/URL/URL.idl", "//Userland/Libraries/LibWeb/UserTiming/PerformanceMark.idl", "//Userland/Libraries/LibWeb/UserTiming/PerformanceMeasure.idl", "//Userland/Libraries/LibWeb/WebAssembly/Instance.idl",