Meta: Handle removal of emoji files in gn build

Also add inspector.html to the file sets that are copied to the build
directory and macOS bundle.
This commit is contained in:
Andrew Kaster 2024-09-25 10:29:51 -06:00 committed by Andrew Kaster
commit 0fefcbcf5e
Notes: github-actions[bot] 2024-09-27 16:17:01 +00:00

View file

@ -157,7 +157,6 @@ executable("ladybird_executable") {
data_deps += [ data_deps += [
":ladybird_copy_cacert", ":ladybird_copy_cacert",
":ladybird_copy_config_resources", ":ladybird_copy_config_resources",
":ladybird_copy_emoji",
":ladybird_copy_fonts", ":ladybird_copy_fonts",
":ladybird_copy_icons_16x16", ":ladybird_copy_icons_16x16",
":ladybird_copy_icons_32x32", ":ladybird_copy_icons_32x32",
@ -201,14 +200,10 @@ executable("headless-browser") {
] ]
} }
_emoji = read_file("//Meta/emoji-file-list.txt", "list lines") fonts = [
emoji = [] "//Base/res/fonts/SerenitySans-Regular.ttf",
"//Base/res/fonts/NotoEmoji.ttf",
foreach(file, _emoji) { ]
emoji += [ "//Base/res/emoji/" + file ]
}
fonts = [ "//Base/res/fonts/SerenitySans-Regular.ttf" ]
icons_16x16 = [ icons_16x16 = [
"//Base/res/icons/16x16/app-system-monitor.png", "//Base/res/icons/16x16/app-system-monitor.png",
@ -271,6 +266,7 @@ themes = [
web_resources = [ web_resources = [
"//Base/res/ladybird/about.html", "//Base/res/ladybird/about.html",
"//Base/res/ladybird/inspector.css", "//Base/res/ladybird/inspector.css",
"//Base/res/ladybird/inspector.html",
"//Base/res/ladybird/inspector.js", "//Base/res/ladybird/inspector.js",
"//Base/res/ladybird/newtab.html", "//Base/res/ladybird/newtab.html",
] ]
@ -290,11 +286,6 @@ config_resources = [
] ]
if (current_os != "mac") { if (current_os != "mac") {
copy("ladybird_copy_emoji") {
sources = emoji
outputs = [ "$root_out_dir/share/Lagom/emoji/{{source_file_part}}" ]
}
copy("ladybird_copy_fonts") { copy("ladybird_copy_fonts") {
sources = fonts sources = fonts
outputs = [ "$root_out_dir/share/Lagom/fonts/{{source_file_part}}" ] outputs = [ "$root_out_dir/share/Lagom/fonts/{{source_file_part}}" ]
@ -447,11 +438,6 @@ if (current_os != "mac") {
outputs = [ "{{bundle_contents_dir}}/lib/{{source_file_part}}" ] outputs = [ "{{bundle_contents_dir}}/lib/{{source_file_part}}" ]
} }
bundle_data("ladybird_emoji") {
sources = emoji
outputs = [ "{{bundle_resources_dir}}/emoji/{{source_file_part}}" ]
}
bundle_data("ladybird_fonts") { bundle_data("ladybird_fonts") {
sources = fonts sources = fonts
outputs = [ "{{bundle_resources_dir}}/fonts/{{source_file_part}}" ] outputs = [ "{{bundle_resources_dir}}/fonts/{{source_file_part}}" ]