From 10298f1e9ab713a26b84394c882a58ee4ed8be21 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Sun, 22 Oct 2023 14:38:34 -0600 Subject: [PATCH] Meta: Move invoke_process_with_args.py to common location This script was already used by both Ladybird and the Kernel, so move it into Meta/gn/build instead. --- .../{secondary/Ladybird => build}/invoke_process_with_args.py | 0 Meta/gn/secondary/Kernel/BUILD.gn | 2 +- Meta/gn/secondary/Kernel/Prekernel/BUILD.gn | 2 +- Meta/gn/secondary/Ladybird/BUILD.gn | 2 +- Meta/gn/secondary/Ladybird/compile_qt_resource_file.gni | 2 +- Meta/gn/secondary/Ladybird/moc_qt_objects.gni | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename Meta/gn/{secondary/Ladybird => build}/invoke_process_with_args.py (100%) diff --git a/Meta/gn/secondary/Ladybird/invoke_process_with_args.py b/Meta/gn/build/invoke_process_with_args.py similarity index 100% rename from Meta/gn/secondary/Ladybird/invoke_process_with_args.py rename to Meta/gn/build/invoke_process_with_args.py diff --git a/Meta/gn/secondary/Kernel/BUILD.gn b/Meta/gn/secondary/Kernel/BUILD.gn index a88d253557..89532cc0cd 100644 --- a/Meta/gn/secondary/Kernel/BUILD.gn +++ b/Meta/gn/secondary/Kernel/BUILD.gn @@ -438,7 +438,7 @@ action("generate_version_header") { if (current_cpu == "x86_64") { action("preprocess_linker_script") { - script = "//Meta/gn/secondary/Ladybird/invoke_process_with_args.py" + script = "//Meta/gn/build/invoke_process_with_args.py" inputs = [ "Arch/x86_64/linker.ld" ] outputs = [ "$target_gen_dir/linker.ld" ] args = [ diff --git a/Meta/gn/secondary/Kernel/Prekernel/BUILD.gn b/Meta/gn/secondary/Kernel/Prekernel/BUILD.gn index b57e5a113e..1a0d50e4ad 100644 --- a/Meta/gn/secondary/Kernel/Prekernel/BUILD.gn +++ b/Meta/gn/secondary/Kernel/Prekernel/BUILD.gn @@ -31,7 +31,7 @@ executable("Prekernel_bin") { } action("postprocess_prekernel") { - script = "//Meta/gn/secondary/Ladybird/invoke_process_with_args.py" + script = "//Meta/gn/build/invoke_process_with_args.py" inputs = [ "$target_out_dir/Prekernel_bin" ] outputs = [ "$target_gen_dir/Prekernel" ] deps = [ ":Prekernel_bin" ] diff --git a/Meta/gn/secondary/Ladybird/BUILD.gn b/Meta/gn/secondary/Ladybird/BUILD.gn index e9f024be58..0170f63242 100644 --- a/Meta/gn/secondary/Ladybird/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/BUILD.gn @@ -257,7 +257,7 @@ if (current_os == "mac") { } action("ladybird_create_icon") { - script = "//Meta/gn/secondary/Ladybird/invoke_process_with_args.py" + script = "//Meta/gn/build/invoke_process_with_args.py" icon_path = "//Ladybird/Icons/macos/app_icon.iconset" sources = [ "$icon_path/icon_128x128.png", diff --git a/Meta/gn/secondary/Ladybird/compile_qt_resource_file.gni b/Meta/gn/secondary/Ladybird/compile_qt_resource_file.gni index dad6ea1da7..0728c2e78f 100644 --- a/Meta/gn/secondary/Ladybird/compile_qt_resource_file.gni +++ b/Meta/gn/secondary/Ladybird/compile_qt_resource_file.gni @@ -4,7 +4,7 @@ template("compile_qt_resource_file") { action_foreach(target_name) { forward_variables_from(invoker, [ "sources" ]) - script = "//Meta/gn/secondary/Ladybird/invoke_process_with_args.py" + script = "//Meta/gn/build/invoke_process_with_args.py" outputs = [ "$target_gen_dir/rcc_{{source_name_part}}.cpp" ] depfile = "$target_gen_dir/rcc_{{source_name_part}}.cpp.d" diff --git a/Meta/gn/secondary/Ladybird/moc_qt_objects.gni b/Meta/gn/secondary/Ladybird/moc_qt_objects.gni index 206a12b5de..9c453a9076 100644 --- a/Meta/gn/secondary/Ladybird/moc_qt_objects.gni +++ b/Meta/gn/secondary/Ladybird/moc_qt_objects.gni @@ -4,7 +4,7 @@ template("moc_qt_objects") { action_foreach(target_name) { forward_variables_from(invoker, [ "sources" ]) - script = "//Meta/gn/secondary/Ladybird/invoke_process_with_args.py" + script = "//Meta/gn/build/invoke_process_with_args.py" outputs = [ "$target_gen_dir/moc_{{source_name_part}}.cpp" ] args = [