From e8808c1c203c306f7b7667f9a0f32422c9f7abbb Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Tue, 24 Mar 2020 19:15:09 +0430 Subject: [PATCH] [meson] Minor, replace tabs with spaces --- .editorconfig | 1 + meson.build | 4 ++-- src/meson.build | 32 ++++++++++++++++---------------- test/shaping/meson.build | 16 ++++++++-------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.editorconfig b/.editorconfig index c64734506..cac917b91 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,5 +18,6 @@ indent_style = tab tab_width = 8 [{meson.build,meson_options.txt}] +tab_width = 8 indent_style = space indent_size = 2 diff --git a/meson.build b/meson.build index 52e829ac0..d89ebb8a7 100644 --- a/meson.build +++ b/meson.build @@ -301,9 +301,9 @@ foreach check : check_funcs foreach link_with : link_withs dep = cpp.find_library(link_with, required: false) if dep.found() - extra_deps += dep + extra_deps += dep else - found = false + found = false endif endforeach diff --git a/src/meson.build b/src/meson.build index 82abe5099..9585a8e35 100644 --- a/src/meson.build +++ b/src/meson.build @@ -170,21 +170,21 @@ hb_base_sources = [ hb_base_ragel_generated_sources = [ 'hb-buffer-deserialize-json.hh', - 'hb-buffer-deserialize-text.hh', - 'hb-number-parser.hh', - 'hb-ot-shape-complex-indic-machine.hh', - 'hb-ot-shape-complex-khmer-machine.hh', - 'hb-ot-shape-complex-myanmar-machine.hh', - 'hb-ot-shape-complex-use-machine.hh', + 'hb-buffer-deserialize-text.hh', + 'hb-number-parser.hh', + 'hb-ot-shape-complex-indic-machine.hh', + 'hb-ot-shape-complex-khmer-machine.hh', + 'hb-ot-shape-complex-myanmar-machine.hh', + 'hb-ot-shape-complex-use-machine.hh', ] hb_base_ragel_sources = [ 'hb-buffer-deserialize-json.rl', - 'hb-buffer-deserialize-text.rl', - 'hb-number-parser.rl', - 'hb-ot-shape-complex-indic-machine.rl', - 'hb-ot-shape-complex-khmer-machine.rl', - 'hb-ot-shape-complex-myanmar-machine.rl', - 'hb-ot-shape-complex-use-machine.rl', + 'hb-buffer-deserialize-text.rl', + 'hb-number-parser.rl', + 'hb-ot-shape-complex-indic-machine.rl', + 'hb-ot-shape-complex-khmer-machine.rl', + 'hb-ot-shape-complex-myanmar-machine.rl', + 'hb-ot-shape-complex-use-machine.rl', ] hb_base_headers = [ @@ -428,10 +428,10 @@ if host_machine.system() != 'windows' and not meson.is_cross_build() # Some of them should be ported to python dist_check_script = [ 'check-c-linkage-decls.sh', - 'check-externs.sh', - 'check-header-guards.sh', - 'check-static-inits.sh', # fails with "check-static-inits.sh: object files not found; skipping test" - 'check-symbols.sh', # fails with "'harfbuzz.def' not found; skipping" + 'check-externs.sh', + 'check-header-guards.sh', + 'check-static-inits.sh', # fails with "check-static-inits.sh: object files not found; skipping test" + 'check-symbols.sh', # fails with "'harfbuzz.def' not found; skipping" ] if not get_option('amalgam') dist_check_script += ['check-includes.sh'] diff --git a/test/shaping/meson.build b/test/shaping/meson.build index 064169b14..5caf25bf7 100644 --- a/test/shaping/meson.build +++ b/test/shaping/meson.build @@ -259,14 +259,14 @@ text_rendering_tests = [ ] disabled_text_rendering_tests = [ - 'CMAP-3.tests', - 'MORX-31.tests', - 'MORX-41.tests', - 'SHARAN-1.tests', - 'SHBALI-1.tests', - 'SHBALI-2.tests', - 'SHKNDA-2.tests', - 'SHKNDA-3.tests', + 'CMAP-3.tests', + 'MORX-31.tests', + 'MORX-41.tests', + 'SHARAN-1.tests', + 'SHBALI-1.tests', + 'SHBALI-2.tests', + 'SHKNDA-2.tests', + 'SHKNDA-3.tests', ] foreach file_name : in_house_tests