From d81c531322c8413cb80aa6ef02943d5e97334705 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 4 Dec 2023 15:24:20 -0500 Subject: [PATCH] Meta: Explicitly list the Ladybird-related HTML files to bundle As noted in the comment added here, we cannot just list the directory containing these files. --- Meta/gn/secondary/Ladybird/BUILD.gn | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Meta/gn/secondary/Ladybird/BUILD.gn b/Meta/gn/secondary/Ladybird/BUILD.gn index d51fce440d..6e4583456e 100644 --- a/Meta/gn/secondary/Ladybird/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/BUILD.gn @@ -284,17 +284,29 @@ if (current_os == "mac") { } bundle_data("ladybird_resources") { + # FIXME: We should not be listing directories here because a change to a file inside any of these directories + # will not cause this action to be invoked. sources = [ "//Base/res/color-palettes", "//Base/res/cursor-themes", "//Base/res/fonts", - "//Base/res/html", "//Base/res/icons", "//Base/res/themes", ] outputs = [ "{{bundle_resources_dir}}/res/" + "{{source_file_part}}" ] } + bundle_data("ladybird_web_resources") { + sources = [ + "//Base/res/ladybird/directory.html", + "//Base/res/ladybird/error.html", + "//Base/res/ladybird/inspector.css", + "//Base/res/ladybird/inspector.js", + "//Base/res/ladybird/new-tab.html", + ] + outputs = [ "{{bundle_resources_dir}}/res/ladybird/{{source_file_part}}" ] + } + bundle_data("ladybird_config_resources") { public_deps = [ "//Userland/Libraries/LibTLS:ca_certificates_download" ] sources = [ @@ -352,6 +364,7 @@ if (current_os == "mac") { ":ladybird_config_resources", ":ladybird_icon", ":ladybird_resources", + ":ladybird_web_resources", ] } }