From e85a690b9606a98a8ba8c02fa50a38d26a313f4b Mon Sep 17 00:00:00 2001 From: userwithuid Date: Wed, 9 Aug 2017 13:41:44 +0000 Subject: [PATCH] build-sys: fix invalid args detected by meson 0.42 (#6561) some run_target() calls were using params from custom_target() example message: WARNING: Passed invalid keyword argument "input". This will become a hard error in the future. New way to call targets: ninja man/man ninja man/html ninja man/update-man-rules --- man/meson.build | 7 ++++--- meson.build | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/man/meson.build b/man/meson.build index a93693c43c..8ddbd5557c 100644 --- a/man/meson.build +++ b/man/meson.build @@ -170,10 +170,10 @@ man = custom_target( depends : man_pages, command : ['echo']) -html = run_target( +html = custom_target( 'html', - depends : html_pages, output : 'html', + depends : html_pages, command : ['echo']) run_target( @@ -191,8 +191,9 @@ run_target( ############################################################ if git.found() - run_target( + custom_target( 'update-man-rules', + output : 'update-man-rules', # slightly strange syntax because of # https://github.com/mesonbuild/meson/issues/1643 # and https://github.com/mesonbuild/meson/issues/1512 diff --git a/meson.build b/meson.build index fbc4807c95..9a8f93f0cf 100644 --- a/meson.build +++ b/meson.build @@ -2344,13 +2344,13 @@ if git.found() ':/*.[ch]']) all_files = files(all_files.stdout().split()) - run_target( + custom_target( 'tags', - input : all_files, + output : 'tags', command : ['env', 'etags', '-o', '@0@/TAGS'.format(meson.source_root())] + all_files) - run_target( + custom_target( 'ctags', - input : all_files, + output : 'ctags', command : ['env', 'ctags', '-o', '@0@/tags'.format(meson.source_root())] + all_files) endif