Skip to content

Fix meson warning for run_command #1139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
turbobastii wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix meson warning for run_command #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
076ff86
Fix meson warning for run_command
turbobastii Oct 1, 2022
3e95fc3
Make meson run_command fail on error
turbobastii Oct 2, 2022
240145f
Replace meson run_command with more appropriate fs.is_dir call
turbobastii Oct 2, 2022
7458808
Simplify the meson is_dir check
turbobastii Oct 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions cursors/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ sizes = [
]

foreach size: sizes
run_command('mkdir', join_paths (meson.build_root(), 'cursors', size + 'x' + size))
run_command('mkdir', join_paths (meson.build_root(), 'cursors', size + 'x' + size), check: true)

foreach cursor : cursors
message('rendering: ' + size + 'x' + size + '/' + cursor + '.png')
Expand All @@ -94,7 +94,8 @@ foreach size: sizes
rsvg, '--format', 'png',
'--width=@0@'.format(size), '--height=@0@'.format(size),
'--output', '@0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, cursor)),
join_paths ('24', cursor + '.svg')
join_paths ('24', cursor + '.svg'),
check: true
)
endforeach

Expand All @@ -105,7 +106,8 @@ foreach size: sizes
rsvg, '--format', 'png',
'--width=@0@'.format(size), '--height=@0@'.format(size),
'--output', '@0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, watch)),
join_paths ('24', watch + '.svg')
join_paths ('24', watch + '.svg'),
check: true
)
endforeach
endforeach
Expand All @@ -122,7 +124,8 @@ foreach cursor : cursors
xcursorgen,
cursor + '.in',
'-p', join_paths (meson.build_root(), 'cursors'),
join_paths (meson.build_root(), 'cursors', cursor)
join_paths (meson.build_root(), 'cursors', cursor),
check: true
)

install_data(
Expand Down
5 changes: 3 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ project (
)

i18n = import('i18n')
fs = import('fs')

icon_dir = join_paths(get_option('datadir'), 'icons', 'elementary')

Expand Down Expand Up @@ -91,8 +92,8 @@ foreach directory_entry : directories
directory = directory_entry[0]
directory_context = directory_entry[1]
foreach size: sizes
result = run_command(ls, join_paths(meson.source_root (), directory, size))
if (result.returncode() == 0)
dir_exists = fs.is_dir(join_paths(meson.source_root (), directory, size))
if dir_exists
foreach scale_factor : scale_factors
# The Scale=1 attribute is useless, don't add it
if (scale_factor.to_int() > 1)
Expand Down