From a729677561fc2e6fc0cf3ce6ad395a77630ebe33 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Tue, 19 Mar 2024 15:38:48 -0400 Subject: [PATCH] Meta: Port recent changes to the GN build 6c26ff567e72e1fb2a0a2d72741fccf1593b0392 e800605ad3e4e9dfdc320c137e1beef1a66d2eb0 cf7c93331264381cb13bdcc18639a5b95269419c --- Meta/gn/secondary/AK/BUILD.gn | 4 ---- Meta/gn/secondary/Ladybird/BUILD.gn | 4 ++++ Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn | 1 + Meta/gn/secondary/Ladybird/WebContent/BUILD.gn | 1 + Meta/gn/secondary/Ladybird/WebDriver/BUILD.gn | 1 + Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn | 1 + Meta/gn/secondary/Tests/AK/BUILD.gn | 1 - Meta/gn/secondary/Tests/BUILD.gn | 1 + Meta/gn/secondary/Tests/LibURL/BUILD.gn | 15 +++++++++++++++ .../secondary/Userland/Libraries/LibCore/BUILD.gn | 1 + .../secondary/Userland/Libraries/LibGUI/BUILD.gn | 1 + .../Userland/Libraries/LibGemini/BUILD.gn | 1 + .../secondary/Userland/Libraries/LibGfx/BUILD.gn | 2 ++ .../secondary/Userland/Libraries/LibHTTP/BUILD.gn | 1 + .../secondary/Userland/Libraries/LibIPC/BUILD.gn | 1 + .../Userland/Libraries/LibProtocol/BUILD.gn | 1 + .../secondary/Userland/Libraries/LibURL/BUILD.gn | 12 ++++++++++++ .../Userland/Libraries/LibUnicode/BUILD.gn | 5 ++++- .../secondary/Userland/Libraries/LibWeb/BUILD.gn | 1 + .../Userland/Libraries/LibWeb/CSS/BUILD.gn | 1 + .../Libraries/LibWeb/HTML/Canvas/BUILD.gn | 1 - .../Userland/Libraries/LibWebSocket/BUILD.gn | 1 + .../Userland/Libraries/LibWebView/BUILD.gn | 1 + 23 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 Meta/gn/secondary/Tests/LibURL/BUILD.gn create mode 100644 Meta/gn/secondary/Userland/Libraries/LibURL/BUILD.gn diff --git a/Meta/gn/secondary/AK/BUILD.gn b/Meta/gn/secondary/AK/BUILD.gn index 86986055c5e..dca87520c75 100644 --- a/Meta/gn/secondary/AK/BUILD.gn +++ b/Meta/gn/secondary/AK/BUILD.gn @@ -204,10 +204,6 @@ shared_library("AK") { "UBSanitizer.h", "UFixedBigInt.h", "UFixedBigIntDivision.h", - "URL.cpp", - "URL.h", - "URLParser.cpp", - "URLParser.h", "UUID.cpp", "UUID.h", "UnicodeUtils.h", diff --git a/Meta/gn/secondary/Ladybird/BUILD.gn b/Meta/gn/secondary/Ladybird/BUILD.gn index 0a8405a7503..1527a707327 100644 --- a/Meta/gn/secondary/Ladybird/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/BUILD.gn @@ -70,6 +70,7 @@ executable("ladybird_executable") { "//Userland/Libraries/LibMain", "//Userland/Libraries/LibProtocol", "//Userland/Libraries/LibSQL", + "//Userland/Libraries/LibURL", "//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWebView", ] @@ -174,6 +175,7 @@ executable("headless-browser") { "//Userland/Libraries/LibMain", "//Userland/Libraries/LibProtocol", "//Userland/Libraries/LibTLS", + "//Userland/Libraries/LibURL", "//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWebSocket", "//Userland/Libraries/LibWebView", @@ -374,6 +376,7 @@ if (current_os != "mac") { "//Userland/Libraries/LibTLS", "//Userland/Libraries/LibTextCodec", "//Userland/Libraries/LibThreading", + "//Userland/Libraries/LibURL", "//Userland/Libraries/LibVideo", "//Userland/Libraries/LibWasm", "//Userland/Libraries/LibWeb", @@ -413,6 +416,7 @@ if (current_os != "mac") { "$root_out_dir/lib/liblagom-textcodec.dylib", "$root_out_dir/lib/liblagom-threading.dylib", "$root_out_dir/lib/liblagom-tls.dylib", + "$root_out_dir/lib/liblagom-url.dylib", "$root_out_dir/lib/liblagom-video.dylib", "$root_out_dir/lib/liblagom-wasm.dylib", "$root_out_dir/lib/liblagom-web.dylib", diff --git a/Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn b/Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn index 460764bac16..16f6fdc33b8 100644 --- a/Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn @@ -15,6 +15,7 @@ executable("RequestServer") { "//Userland/Libraries/LibMain", "//Userland/Libraries/LibProtocol", "//Userland/Libraries/LibTLS", + "//Userland/Libraries/LibURL", "//Userland/Libraries/LibWebSocket", ] sources = [ diff --git a/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn b/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn index e39db3178b9..6cd08e07521 100644 --- a/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn @@ -37,6 +37,7 @@ executable("WebContent") { "//Userland/Libraries/LibJS", "//Userland/Libraries/LibMain", "//Userland/Libraries/LibProtocol", + "//Userland/Libraries/LibURL", "//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWebSocket", "//Userland/Libraries/LibWebView", diff --git a/Meta/gn/secondary/Ladybird/WebDriver/BUILD.gn b/Meta/gn/secondary/Ladybird/WebDriver/BUILD.gn index ba1fb427ce4..1661828edfb 100644 --- a/Meta/gn/secondary/Ladybird/WebDriver/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/WebDriver/BUILD.gn @@ -18,6 +18,7 @@ executable("WebDriver") { "//Userland/Libraries/LibIPC", "//Userland/Libraries/LibJS", "//Userland/Libraries/LibMain", + "//Userland/Libraries/LibURL", "//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWebSocket", "//Userland/Libraries/LibWebView:WebDriverClientEndpoint", diff --git a/Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn b/Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn index bae40bb3fc4..ec6bec47e6f 100644 --- a/Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/WebWorker/BUILD.gn @@ -15,6 +15,7 @@ executable("WebWorker") { "//Userland/Libraries/LibLocale", "//Userland/Libraries/LibMain", "//Userland/Libraries/LibProtocol", + "//Userland/Libraries/LibURL", "//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWeb:WebWorkerClientEndpoint", "//Userland/Libraries/LibWeb:WebWorkerServerEndpoint", diff --git a/Meta/gn/secondary/Tests/AK/BUILD.gn b/Meta/gn/secondary/Tests/AK/BUILD.gn index e3c336a7fcc..219186c8c1a 100644 --- a/Meta/gn/secondary/Tests/AK/BUILD.gn +++ b/Meta/gn/secondary/Tests/AK/BUILD.gn @@ -80,7 +80,6 @@ tests = [ "TestTypeTraits", "TestTypedTransfer", "TestUFixedBigInt", - "TestURL", "TestUtf16", "TestUtf8", "TestVariant", diff --git a/Meta/gn/secondary/Tests/BUILD.gn b/Meta/gn/secondary/Tests/BUILD.gn index a8e3c9f027c..c90f90812bb 100644 --- a/Meta/gn/secondary/Tests/BUILD.gn +++ b/Meta/gn/secondary/Tests/BUILD.gn @@ -2,6 +2,7 @@ group("Tests") { deps = [ "//Tests/AK", "//Tests/LibJS", + "//Tests/LibURL", ] testonly = true } diff --git a/Meta/gn/secondary/Tests/LibURL/BUILD.gn b/Meta/gn/secondary/Tests/LibURL/BUILD.gn new file mode 100644 index 00000000000..6ba7cc0984b --- /dev/null +++ b/Meta/gn/secondary/Tests/LibURL/BUILD.gn @@ -0,0 +1,15 @@ +import("//Tests/unittest.gni") + +unittest("TestURL") { + include_dirs = [ "//Userland/Libraries" ] + sources = [ "TestURL.cpp" ] + deps = [ + "//AK", + "//Userland/Libraries/LibURL", + ] +} + +group("LibURL") { + testonly = true + deps = [ ":TestURL" ] +} diff --git a/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn index a5b1586db07..2c6dce13e28 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn @@ -141,5 +141,6 @@ shared_library("LibCore") { "//Meta/gn/build/libs/crypt", "//Meta/gn/build/libs/pthread", "//Userland/Libraries/LibSystem", + "//Userland/Libraries/LibURL", ] } diff --git a/Meta/gn/secondary/Userland/Libraries/LibGUI/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibGUI/BUILD.gn index cb6757055df..a2cf2afcbc0 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibGUI/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibGUI/BUILD.gn @@ -19,5 +19,6 @@ shared_library("LibGUI") { "//Userland/Libraries/LibCore", "//Userland/Libraries/LibGfx", "//Userland/Libraries/LibSyntax", + "//Userland/Libraries/LibURL", ] } diff --git a/Meta/gn/secondary/Userland/Libraries/LibGemini/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibGemini/BUILD.gn index 9be8f83fab1..959a780866f 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibGemini/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibGemini/BUILD.gn @@ -12,5 +12,6 @@ shared_library("LibGemini") { "//AK", "//Userland/Libraries/LibCore", "//Userland/Libraries/LibTLS", + "//Userland/Libraries/LibURL", ] } diff --git a/Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn index b390184d0e1..f027701b560 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn @@ -97,6 +97,7 @@ shared_library("LibGfx") { "Painter.cpp", "Palette.cpp", "Path.cpp", + "PathClipper.cpp", "Point.cpp", "Rect.cpp", "ShareableBitmap.cpp", @@ -122,6 +123,7 @@ shared_library("LibGfx") { "//Userland/Libraries/LibIPC", "//Userland/Libraries/LibRIFF", "//Userland/Libraries/LibTextCodec", + "//Userland/Libraries/LibURL", "//Userland/Libraries/LibUnicode", ] } diff --git a/Meta/gn/secondary/Userland/Libraries/LibHTTP/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibHTTP/BUILD.gn index 0219ceddb55..7b99d33f3e2 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibHTTP/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibHTTP/BUILD.gn @@ -12,5 +12,6 @@ shared_library("LibHTTP") { "//Userland/Libraries/LibCompress", "//Userland/Libraries/LibCore", "//Userland/Libraries/LibTLS", + "//Userland/Libraries/LibURL", ] } diff --git a/Meta/gn/secondary/Userland/Libraries/LibIPC/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibIPC/BUILD.gn index fccab344170..07999f86da1 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibIPC/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibIPC/BUILD.gn @@ -22,5 +22,6 @@ shared_library("LibIPC") { deps = [ "//AK", "//Userland/Libraries/LibCore", + "//Userland/Libraries/LibURL", ] } diff --git a/Meta/gn/secondary/Userland/Libraries/LibProtocol/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibProtocol/BUILD.gn index faa3fce9226..a97e61c5a6f 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibProtocol/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibProtocol/BUILD.gn @@ -34,6 +34,7 @@ shared_library("LibProtocol") { "//AK", "//Userland/Libraries/LibCore", "//Userland/Libraries/LibIPC", + "//Userland/Libraries/LibURL", ] sources = [ "Request.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibURL/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibURL/BUILD.gn new file mode 100644 index 00000000000..510fd1a03e5 --- /dev/null +++ b/Meta/gn/secondary/Userland/Libraries/LibURL/BUILD.gn @@ -0,0 +1,12 @@ +shared_library("LibURL") { + output_name = "url" + include_dirs = [ "//Userland/Libraries" ] + sources = [ + "Forward.h", + "Parser.cpp", + "Parser.h", + "URL.cpp", + "URL.h", + ] + deps = [ "//AK" ] +} diff --git a/Meta/gn/secondary/Userland/Libraries/LibUnicode/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibUnicode/BUILD.gn index d65e87f5e50..72f637ada9d 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibUnicode/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibUnicode/BUILD.gn @@ -177,7 +177,10 @@ source_set("LibUnicode") { "URL.cpp", "UnicodeUtils.cpp", ] - deps = [ "//AK" ] + deps = [ + "//AK", + "//Userland/Libraries/LibURL", + ] if (enable_unicode_database_download) { deps += [ diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn index 956019dd64b..156875a8d40 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/BUILD.gn @@ -377,6 +377,7 @@ shared_library("LibWeb") { "//Userland/Libraries/LibSoftGPU", "//Userland/Libraries/LibSyntax", "//Userland/Libraries/LibTextCodec", + "//Userland/Libraries/LibURL", "//Userland/Libraries/LibUnicode", "//Userland/Libraries/LibVideo", "//Userland/Libraries/LibWasm", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/BUILD.gn index 82386ea14c8..344e90216b6 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/BUILD.gn @@ -52,6 +52,7 @@ source_set("CSS") { "Serialize.cpp", "Size.cpp", "StyleComputer.cpp", + "StyleInvalidation.cpp", "StyleProperties.cpp", "StyleProperty.cpp", "StyleSheet.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/HTML/Canvas/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/HTML/Canvas/BUILD.gn index f28b1a7ba17..b1f062974e2 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/HTML/Canvas/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/HTML/Canvas/BUILD.gn @@ -4,7 +4,6 @@ source_set("Canvas") { sources = [ "CanvasDrawImage.cpp", "CanvasPath.cpp", - "CanvasPathClipper.cpp", "CanvasState.cpp", ] } diff --git a/Meta/gn/secondary/Userland/Libraries/LibWebSocket/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWebSocket/BUILD.gn index 26593771cc8..349cedebf2a 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWebSocket/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWebSocket/BUILD.gn @@ -6,6 +6,7 @@ shared_library("LibWebSocket") { "//Userland/Libraries/LibCore", "//Userland/Libraries/LibCrypto", "//Userland/Libraries/LibTLS", + "//Userland/Libraries/LibURL", ] sources = [ "ConnectionInfo.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn index dad1fbac772..a23901b99c6 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn @@ -113,6 +113,7 @@ shared_library("LibWebView") { "//Userland/Libraries/LibJS", "//Userland/Libraries/LibProtocol", "//Userland/Libraries/LibSQL", + "//Userland/Libraries/LibURL", "//Userland/Libraries/LibWeb", ] sources = [