From 59eba426d281c66d90eaba6ee3c2a25c8dc05b9d Mon Sep 17 00:00:00 2001 From: psykose Date: Wed, 30 Oct 2024 04:28:11 +0100 Subject: [PATCH] meson fmt --- meson.build | 26 +++++++++++--------------- resources/meson.build | 23 ++++++++++++++++++++--- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/meson.build b/meson.build index 510c5e4..c87f414 100644 --- a/meson.build +++ b/meson.build @@ -54,16 +54,17 @@ endif cargo = find_program('cargo') cargo_env = environment() cargo_env.set('MESON_BUILD_ROOT', meson.project_build_root()) -cargo_env.append('RUSTFLAGS', '-L ' + fs.parent(audrey_c.full_path()), separator: ' ') +cargo_env.append( + 'RUSTFLAGS', + '-L ' + fs.parent(audrey_c.full_path()), + separator: ' ', +) custom_target( 'cargo-build', build_by_default: true, build_always_stale: true, - depends: [ - audrey_c, - blueprints, - ], + depends: [audrey_c, blueprints], console: true, # means nothing (always stale and uncopied), we can't cp since env: drops the /bin/sh wrapper output: meson.project_name(), @@ -71,17 +72,12 @@ custom_target( cargo, 'build', rust_args, - '--manifest-path', meson.project_source_root() / 'Cargo.toml', - '--target-dir', meson.project_build_root() / 'cargo-target', + '--manifest-path', + meson.project_source_root() / 'Cargo.toml', + '--target-dir', + meson.project_build_root() / 'cargo-target', ], env: cargo_env, ) -run_target( - 'clippy', - command: [ - cargo, - 'clippy', - ], - env: cargo_env, -) +run_target('clippy', command: [cargo, 'clippy'], env: cargo_env) diff --git a/resources/meson.build b/resources/meson.build index 9507ff1..b71709d 100644 --- a/resources/meson.build +++ b/resources/meson.build @@ -1,7 +1,19 @@ blueprints = custom_target( 'blueprints', - input: files('play_queue.blp', 'play_queue_song.blp', 'playbar.blp', 'setup.blp', 'window.blp'), - output: ['play_queue.ui', 'play_queue_song.ui', 'playbar.ui', 'setup.ui', 'window.ui'], + input: files( + 'play_queue.blp', + 'play_queue_song.blp', + 'playbar.blp', + 'setup.blp', + 'window.blp', + ), + output: [ + 'play_queue.ui', + 'play_queue_song.ui', + 'playbar.ui', + 'setup.ui', + 'window.ui', + ], command: [ find_program('blueprint-compiler'), 'batch-compile', @@ -11,4 +23,9 @@ blueprints = custom_target( ], ) -removeme = gnome.compile_resources('audrey-resources', 'audrey.gresource.xml', c_name: 'audrey', dependencies: blueprints) +removeme = gnome.compile_resources( + 'audrey-resources', + 'audrey.gresource.xml', + c_name: 'audrey', + dependencies: blueprints, +)