Skip to content

Commit

Permalink
build-sys: fix invalid args detected by meson 0.42 (systemd#6561)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
userwithuid authored and andir committed Sep 7, 2017
1 parent 858e454 commit fd5b684
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
7 changes: 4 additions & 3 deletions man/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit fd5b684

Please sign in to comment.