From 4dbb73b360a9c5289ad25f39e121f0e0aeb82e0a Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Thu, 26 Oct 2023 21:05:16 -0600 Subject: [PATCH] Meta+Documentation+Ladybird: Update places that use ladybird filename Fallout from 01feae24b28fb6c23003a6f71e70df6d5068150c These places referred to the filename "ladybird" directly, but we changed the OUTPUT_NAME of ladybird to "Ladybird". --- Documentation/BuildInstructionsLadybird.md | 2 +- Ladybird/WebDriver/main.cpp | 2 +- Meta/gn/secondary/BUILD.gn | 2 +- Meta/gn/secondary/Ladybird/BUILD.gn | 11 ++++------- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Documentation/BuildInstructionsLadybird.md b/Documentation/BuildInstructionsLadybird.md index a2c0fe02567..1b922f667c7 100644 --- a/Documentation/BuildInstructionsLadybird.md +++ b/Documentation/BuildInstructionsLadybird.md @@ -157,7 +157,7 @@ ninja -C Build/ladybird debug To run without ninja rule: ``` export SERENITY_SOURCE_DIR=$(realpath ../) -./Build/ladybird/bin/ladybird # or, in macOS: open ./Build/ladybird/bin/ladybird.app +./Build/ladybird/bin/Ladybird # or, in macOS: open ./Build/ladybird/bin/Ladybird.app ``` ### Debugging with CLion diff --git a/Ladybird/WebDriver/main.cpp b/Ladybird/WebDriver/main.cpp index cd9abf9c3d7..17bb28f31b2 100644 --- a/Ladybird/WebDriver/main.cpp +++ b/Ladybird/WebDriver/main.cpp @@ -32,7 +32,7 @@ static ErrorOr launch_process(StringView application, ReadonlySpan launch_browser(DeprecatedString const& socket_path) { - return launch_process("ladybird"sv, + return launch_process("Ladybird"sv, Array { "--webdriver-content-path", socket_path.characters(), diff --git a/Meta/gn/secondary/BUILD.gn b/Meta/gn/secondary/BUILD.gn index 62032ccfb84..4f9bb8d2e10 100644 --- a/Meta/gn/secondary/BUILD.gn +++ b/Meta/gn/secondary/BUILD.gn @@ -2,7 +2,7 @@ import("//Meta/gn/build/toolchain/compiler.gni") group("default") { deps = [ - "//Ladybird:ladybird", + "//Ladybird", "//Meta/Lagom/Tools/CodeGenerators/IPCCompiler", "//Tests", "//Userland/Libraries/LibWeb", diff --git a/Meta/gn/secondary/Ladybird/BUILD.gn b/Meta/gn/secondary/Ladybird/BUILD.gn index 0170f632427..2ed4679e675 100644 --- a/Meta/gn/secondary/Ladybird/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/BUILD.gn @@ -2,7 +2,7 @@ import("//Ladybird/compile_qt_resource_file.gni") import("//Ladybird/link_qt.gni") import("//Ladybird/moc_qt_objects.gni") -group("ladybird") { +group("Ladybird") { if (current_os == "mac") { deps = [ ":ladybird.app" ] } else { @@ -98,10 +98,7 @@ executable("ladybird_executable") { ] sources += get_target_outputs(":generate_moc") + get_target_outputs(":compile_resource_file") - if (current_os == "android") { - sources += [ "AndroidPlatform.cpp" ] - } - output_name = "ladybird" + output_name = "Ladybird" } executable("headless-browser") { @@ -149,13 +146,13 @@ if (current_os == "mac") { "WebSocket", ] sources = [ + "$root_out_dir/bin/Ladybird", "$root_out_dir/bin/RequestServer", "$root_out_dir/bin/SQLServer", "$root_out_dir/bin/WebContent", "$root_out_dir/bin/WebDriver", "$root_out_dir/bin/WebSocket", "$root_out_dir/bin/headless-browser", - "$root_out_dir/bin/ladybird", ] outputs = [ "{{bundle_executable_dir}}/{{source_file_part}}" ] } @@ -288,7 +285,7 @@ if (current_os == "mac") { outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ] } - create_bundle("ladybird.app") { + create_bundle("Ladybird.app") { product_type = "com.apple.product-type.application" bundle_root_dir = "$root_build_dir/$target_name"