Meta: Port recent changes to the GN build

6c26ff567e
e800605ad3
cf7c933312
This commit is contained in:
Timothy Flynn 2024-03-19 15:38:48 -04:00 committed by Tim Flynn
parent feddecde5b
commit a729677561
Notes: sideshowbarker 2024-07-18 08:59:31 +09:00
23 changed files with 52 additions and 7 deletions

View File

@ -204,10 +204,6 @@ shared_library("AK") {
"UBSanitizer.h", "UBSanitizer.h",
"UFixedBigInt.h", "UFixedBigInt.h",
"UFixedBigIntDivision.h", "UFixedBigIntDivision.h",
"URL.cpp",
"URL.h",
"URLParser.cpp",
"URLParser.h",
"UUID.cpp", "UUID.cpp",
"UUID.h", "UUID.h",
"UnicodeUtils.h", "UnicodeUtils.h",

View File

@ -70,6 +70,7 @@ executable("ladybird_executable") {
"//Userland/Libraries/LibMain", "//Userland/Libraries/LibMain",
"//Userland/Libraries/LibProtocol", "//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibSQL", "//Userland/Libraries/LibSQL",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWeb",
"//Userland/Libraries/LibWebView", "//Userland/Libraries/LibWebView",
] ]
@ -174,6 +175,7 @@ executable("headless-browser") {
"//Userland/Libraries/LibMain", "//Userland/Libraries/LibMain",
"//Userland/Libraries/LibProtocol", "//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibTLS", "//Userland/Libraries/LibTLS",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWeb",
"//Userland/Libraries/LibWebSocket", "//Userland/Libraries/LibWebSocket",
"//Userland/Libraries/LibWebView", "//Userland/Libraries/LibWebView",
@ -374,6 +376,7 @@ if (current_os != "mac") {
"//Userland/Libraries/LibTLS", "//Userland/Libraries/LibTLS",
"//Userland/Libraries/LibTextCodec", "//Userland/Libraries/LibTextCodec",
"//Userland/Libraries/LibThreading", "//Userland/Libraries/LibThreading",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibVideo", "//Userland/Libraries/LibVideo",
"//Userland/Libraries/LibWasm", "//Userland/Libraries/LibWasm",
"//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWeb",
@ -413,6 +416,7 @@ if (current_os != "mac") {
"$root_out_dir/lib/liblagom-textcodec.dylib", "$root_out_dir/lib/liblagom-textcodec.dylib",
"$root_out_dir/lib/liblagom-threading.dylib", "$root_out_dir/lib/liblagom-threading.dylib",
"$root_out_dir/lib/liblagom-tls.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-video.dylib",
"$root_out_dir/lib/liblagom-wasm.dylib", "$root_out_dir/lib/liblagom-wasm.dylib",
"$root_out_dir/lib/liblagom-web.dylib", "$root_out_dir/lib/liblagom-web.dylib",

View File

@ -15,6 +15,7 @@ executable("RequestServer") {
"//Userland/Libraries/LibMain", "//Userland/Libraries/LibMain",
"//Userland/Libraries/LibProtocol", "//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibTLS", "//Userland/Libraries/LibTLS",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWebSocket", "//Userland/Libraries/LibWebSocket",
] ]
sources = [ sources = [

View File

@ -37,6 +37,7 @@ executable("WebContent") {
"//Userland/Libraries/LibJS", "//Userland/Libraries/LibJS",
"//Userland/Libraries/LibMain", "//Userland/Libraries/LibMain",
"//Userland/Libraries/LibProtocol", "//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWeb",
"//Userland/Libraries/LibWebSocket", "//Userland/Libraries/LibWebSocket",
"//Userland/Libraries/LibWebView", "//Userland/Libraries/LibWebView",

View File

@ -18,6 +18,7 @@ executable("WebDriver") {
"//Userland/Libraries/LibIPC", "//Userland/Libraries/LibIPC",
"//Userland/Libraries/LibJS", "//Userland/Libraries/LibJS",
"//Userland/Libraries/LibMain", "//Userland/Libraries/LibMain",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWeb",
"//Userland/Libraries/LibWebSocket", "//Userland/Libraries/LibWebSocket",
"//Userland/Libraries/LibWebView:WebDriverClientEndpoint", "//Userland/Libraries/LibWebView:WebDriverClientEndpoint",

View File

@ -15,6 +15,7 @@ executable("WebWorker") {
"//Userland/Libraries/LibLocale", "//Userland/Libraries/LibLocale",
"//Userland/Libraries/LibMain", "//Userland/Libraries/LibMain",
"//Userland/Libraries/LibProtocol", "//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWeb",
"//Userland/Libraries/LibWeb:WebWorkerClientEndpoint", "//Userland/Libraries/LibWeb:WebWorkerClientEndpoint",
"//Userland/Libraries/LibWeb:WebWorkerServerEndpoint", "//Userland/Libraries/LibWeb:WebWorkerServerEndpoint",

View File

@ -80,7 +80,6 @@ tests = [
"TestTypeTraits", "TestTypeTraits",
"TestTypedTransfer", "TestTypedTransfer",
"TestUFixedBigInt", "TestUFixedBigInt",
"TestURL",
"TestUtf16", "TestUtf16",
"TestUtf8", "TestUtf8",
"TestVariant", "TestVariant",

View File

@ -2,6 +2,7 @@ group("Tests") {
deps = [ deps = [
"//Tests/AK", "//Tests/AK",
"//Tests/LibJS", "//Tests/LibJS",
"//Tests/LibURL",
] ]
testonly = true testonly = true
} }

View File

@ -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" ]
}

View File

@ -141,5 +141,6 @@ shared_library("LibCore") {
"//Meta/gn/build/libs/crypt", "//Meta/gn/build/libs/crypt",
"//Meta/gn/build/libs/pthread", "//Meta/gn/build/libs/pthread",
"//Userland/Libraries/LibSystem", "//Userland/Libraries/LibSystem",
"//Userland/Libraries/LibURL",
] ]
} }

View File

@ -19,5 +19,6 @@ shared_library("LibGUI") {
"//Userland/Libraries/LibCore", "//Userland/Libraries/LibCore",
"//Userland/Libraries/LibGfx", "//Userland/Libraries/LibGfx",
"//Userland/Libraries/LibSyntax", "//Userland/Libraries/LibSyntax",
"//Userland/Libraries/LibURL",
] ]
} }

View File

@ -12,5 +12,6 @@ shared_library("LibGemini") {
"//AK", "//AK",
"//Userland/Libraries/LibCore", "//Userland/Libraries/LibCore",
"//Userland/Libraries/LibTLS", "//Userland/Libraries/LibTLS",
"//Userland/Libraries/LibURL",
] ]
} }

View File

@ -97,6 +97,7 @@ shared_library("LibGfx") {
"Painter.cpp", "Painter.cpp",
"Palette.cpp", "Palette.cpp",
"Path.cpp", "Path.cpp",
"PathClipper.cpp",
"Point.cpp", "Point.cpp",
"Rect.cpp", "Rect.cpp",
"ShareableBitmap.cpp", "ShareableBitmap.cpp",
@ -122,6 +123,7 @@ shared_library("LibGfx") {
"//Userland/Libraries/LibIPC", "//Userland/Libraries/LibIPC",
"//Userland/Libraries/LibRIFF", "//Userland/Libraries/LibRIFF",
"//Userland/Libraries/LibTextCodec", "//Userland/Libraries/LibTextCodec",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibUnicode", "//Userland/Libraries/LibUnicode",
] ]
} }

View File

@ -12,5 +12,6 @@ shared_library("LibHTTP") {
"//Userland/Libraries/LibCompress", "//Userland/Libraries/LibCompress",
"//Userland/Libraries/LibCore", "//Userland/Libraries/LibCore",
"//Userland/Libraries/LibTLS", "//Userland/Libraries/LibTLS",
"//Userland/Libraries/LibURL",
] ]
} }

View File

@ -22,5 +22,6 @@ shared_library("LibIPC") {
deps = [ deps = [
"//AK", "//AK",
"//Userland/Libraries/LibCore", "//Userland/Libraries/LibCore",
"//Userland/Libraries/LibURL",
] ]
} }

View File

@ -34,6 +34,7 @@ shared_library("LibProtocol") {
"//AK", "//AK",
"//Userland/Libraries/LibCore", "//Userland/Libraries/LibCore",
"//Userland/Libraries/LibIPC", "//Userland/Libraries/LibIPC",
"//Userland/Libraries/LibURL",
] ]
sources = [ sources = [
"Request.cpp", "Request.cpp",

View File

@ -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" ]
}

View File

@ -177,7 +177,10 @@ source_set("LibUnicode") {
"URL.cpp", "URL.cpp",
"UnicodeUtils.cpp", "UnicodeUtils.cpp",
] ]
deps = [ "//AK" ] deps = [
"//AK",
"//Userland/Libraries/LibURL",
]
if (enable_unicode_database_download) { if (enable_unicode_database_download) {
deps += [ deps += [

View File

@ -377,6 +377,7 @@ shared_library("LibWeb") {
"//Userland/Libraries/LibSoftGPU", "//Userland/Libraries/LibSoftGPU",
"//Userland/Libraries/LibSyntax", "//Userland/Libraries/LibSyntax",
"//Userland/Libraries/LibTextCodec", "//Userland/Libraries/LibTextCodec",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibUnicode", "//Userland/Libraries/LibUnicode",
"//Userland/Libraries/LibVideo", "//Userland/Libraries/LibVideo",
"//Userland/Libraries/LibWasm", "//Userland/Libraries/LibWasm",

View File

@ -52,6 +52,7 @@ source_set("CSS") {
"Serialize.cpp", "Serialize.cpp",
"Size.cpp", "Size.cpp",
"StyleComputer.cpp", "StyleComputer.cpp",
"StyleInvalidation.cpp",
"StyleProperties.cpp", "StyleProperties.cpp",
"StyleProperty.cpp", "StyleProperty.cpp",
"StyleSheet.cpp", "StyleSheet.cpp",

View File

@ -4,7 +4,6 @@ source_set("Canvas") {
sources = [ sources = [
"CanvasDrawImage.cpp", "CanvasDrawImage.cpp",
"CanvasPath.cpp", "CanvasPath.cpp",
"CanvasPathClipper.cpp",
"CanvasState.cpp", "CanvasState.cpp",
] ]
} }

View File

@ -6,6 +6,7 @@ shared_library("LibWebSocket") {
"//Userland/Libraries/LibCore", "//Userland/Libraries/LibCore",
"//Userland/Libraries/LibCrypto", "//Userland/Libraries/LibCrypto",
"//Userland/Libraries/LibTLS", "//Userland/Libraries/LibTLS",
"//Userland/Libraries/LibURL",
] ]
sources = [ sources = [
"ConnectionInfo.cpp", "ConnectionInfo.cpp",

View File

@ -113,6 +113,7 @@ shared_library("LibWebView") {
"//Userland/Libraries/LibJS", "//Userland/Libraries/LibJS",
"//Userland/Libraries/LibProtocol", "//Userland/Libraries/LibProtocol",
"//Userland/Libraries/LibSQL", "//Userland/Libraries/LibSQL",
"//Userland/Libraries/LibURL",
"//Userland/Libraries/LibWeb", "//Userland/Libraries/LibWeb",
] ]
sources = [ sources = [