organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-07 06:25:03 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

[fontations] Use proper meson function for running commands

Browse source
This commit is contained in:
Behdad Esfahbod 2025-03-07 21:32:05 -07:00
parent 52852c6cb6
commit aabf8aadf8
2 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -462,12 +462,6 @@ configure_file(output: 'config.h', configuration: conf)
alias_target('lib', libharfbuzz)
alias_target('libs', libharfbuzz, libharfbuzz_subset)
if get_option('fontations').enabled()
alias_target('clippy', clippy)
alias_target('clippy-check', clippy_check)
alias_target('fmt', fmt)
alias_target('fmt-check', fmt_check)
endif
if meson.version().version_compare('>=0.57.0')
# Re glib, see https://github.com/harfbuzz/harfbuzz/issues/4153#issuecomment-2646347531

23
src/fontations/meson.build
View file

@ -8,7 +8,6 @@ hb_rs = rust.bindgen(
'--allowlist-type=hb_.*',
'--no-copy=hb_.*',
],
#args : ['--no-rustfmt-bindings'],
)
cargo = find_program('cargo')
@ -53,26 +52,20 @@ harfbuzz_fontations_dep = declare_dependency(
link_whole: harfbuzz_fontations,
)
clippy = custom_target(
clippy = run_target(
'clippy',
input: 'lib.rs',
output: 'clippy',
depends: [hb_rs],
env: ['OUT_DIR=' + meson.current_build_dir()],
command: [
cargo, 'clippy',
] + cargo_args + [
'--allow-dirty', '--fix',
] + cargo_args + [
'--lib', '-p', 'harfbuzz_fontations',
'--target-dir', meson.current_build_dir(),
'--manifest-path', meson.current_source_dir() / 'Cargo.toml',
],
)
clippy_check = custom_target(
clippy_check = run_target(
'clippy-check',
input: 'lib.rs',
output: 'clippy-check',
depends: [hb_rs],
env: ['OUT_DIR=' + meson.current_build_dir()],
command: [
cargo, 'clippy',
@ -84,11 +77,8 @@ clippy_check = custom_target(
],
)
fmt = custom_target(
fmt = run_target(
'fmt',
input: 'lib.rs',
output: 'fmt',
depends: [hb_rs],
env: ['OUT_DIR=' + meson.current_build_dir()],
command: [
rustfmt,
@ -97,11 +87,8 @@ fmt = custom_target(
meson.current_source_dir() / 'lib.rs',
],
)
fmt_check = custom_target(
fmt_check = run_target(
'fmt-check',
input: 'lib.rs',
output: 'fmt-check',
depends: [hb_rs],
env: ['OUT_DIR=' + meson.current_build_dir()],
command: [
rustfmt,