From 86219e28d1eba882bb7ee451fbf604ec26677154 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Mon, 29 Dec 2025 23:30:38 +0900 Subject: [PATCH] meson: Coding style - Use 2 spaces - Use trailing commans when possible - Declare dependencies as a variable to keep "executable" clean --- .editorconfig | 6 ++++- data/meson.build | 58 +++++++++++++++++++++--------------------- meson.build | 14 +++++----- po/extra/meson.build | 12 ++++----- po/meson.build | 12 ++++----- src/Daemon/meson.build | 4 +-- src/meson.build | 56 ++++++++++++++++++++-------------------- 7 files changed, 84 insertions(+), 78 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1910e15..062ac9d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,5 +12,9 @@ max_line_length = 120 tab_width = 4 # Markup files -[{*.html,*.xml,*.xml.in,*.yml}] +[{*.html,*.xml,*.xml.in*,*.yml}] +tab_width = 2 + +# meson files +[{meson.*}] tab_width = 2 diff --git a/data/meson.build b/data/meson.build index 15b084c..0d00b4a 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,58 +1,58 @@ icon_sizes = ['16', '24', '32', '48', '64', '128'] foreach i : icon_sizes - install_data( - 'icons' / i + 'x' + i / 'apps' / meson.project_name() + '.png', - install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps' - ) + install_data( + 'icons' / i + 'x' + i / 'apps' / meson.project_name() + '.png', + install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps', + ) endforeach install_data( - 'icons' / 'scalable' / 'apps' / meson.project_name() + '.svg', - install_dir: get_option('datadir') / 'icons' / 'hicolor' / 'scalable' / 'apps' + 'icons' / 'scalable' / 'apps' / meson.project_name() + '.svg', + install_dir: get_option('datadir') / 'icons' / 'hicolor' / 'scalable' / 'apps', ) appstream_conf = configuration_data() appstream_conf.set('VERSION', meson.project_version()) appstream_file_in = configure_file( - input: meson.project_name() + '.metainfo.xml.in.in', - output: meson.project_name() + '.metainfo.xml.in', - configuration: appstream_conf + input: meson.project_name() + '.metainfo.xml.in.in', + output: meson.project_name() + '.metainfo.xml.in', + configuration: appstream_conf, ) appstream_file = i18n.merge_file( - input: appstream_file_in, - output: meson.project_name() + '.metainfo.xml', - po_dir: meson.project_source_root() / 'po' / 'extra', - install: true, - install_dir: get_option('datadir') / 'metainfo' + input: appstream_file_in, + output: meson.project_name() + '.metainfo.xml', + po_dir: meson.project_source_root() / 'po' / 'extra', + install: true, + install_dir: get_option('datadir') / 'metainfo', ) desktop_conf = configuration_data() desktop_conf.set('EXEC_NAME', meson.project_name()) desktop_file_in = configure_file( - input: meson.project_name() + '.desktop.in.in', - output: meson.project_name() + '.desktop.in', - configuration: desktop_conf + input: meson.project_name() + '.desktop.in.in', + output: meson.project_name() + '.desktop.in', + configuration: desktop_conf, ) i18n.merge_file( - input: desktop_file_in, - output: meson.project_name() + '.desktop', - po_dir: meson.project_source_root() / 'po' / 'extra', - type: 'desktop', - install: true, - install_dir: get_option('datadir') / 'applications' + input: desktop_file_in, + output: meson.project_name() + '.desktop', + po_dir: meson.project_source_root() / 'po' / 'extra', + type: 'desktop', + install: true, + install_dir: get_option('datadir') / 'applications', ) install_data( - meson.project_name() + '.gschema.xml', - install_dir: get_option('datadir') / 'glib-2.0' / 'schemas' + meson.project_name() + '.gschema.xml', + install_dir: get_option('datadir') / 'glib-2.0' / 'schemas', ) asresources = gnome.compile_resources( - 'as-resources', - meson.project_name() + '.gresource.xml', - source_dir: 'data', - c_name: 'as' + 'as-resources', + meson.project_name() + '.gresource.xml', + source_dir: 'data', + c_name: 'as', ) diff --git a/meson.build b/meson.build index c327fd8..fa764df 100644 --- a/meson.build +++ b/meson.build @@ -1,15 +1,15 @@ project('com.github.sgpthomas.hourglass', - 'vala', 'c', - version: '3.1.1', - meson_version: '>=0.57.0' + 'vala', 'c', + version: '3.1.1', + meson_version: '>= 0.57.0', ) gnome = import('gnome') i18n = import('i18n') add_project_arguments( - '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), - language:'c' + '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), + language:'c', ) subdir ('data') @@ -17,6 +17,6 @@ subdir ('po') subdir ('src') gnome.post_install( - glib_compile_schemas: true, - gtk_update_icon_cache: true + glib_compile_schemas: true, + gtk_update_icon_cache: true, ) diff --git a/po/extra/meson.build b/po/extra/meson.build index ecb5c34..a957ced 100644 --- a/po/extra/meson.build +++ b/po/extra/meson.build @@ -1,8 +1,8 @@ i18n.gettext('extra', - args: [ - '--directory=' + meson.project_source_root(), - '--from-code=UTF-8' - ], - install: false, - preset: 'glib' + args: [ + '--directory=' + meson.project_source_root(), + '--from-code=UTF-8', + ], + install: false, + preset: 'glib', ) diff --git a/po/meson.build b/po/meson.build index 9d4d136..6f6cb8f 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,10 +1,10 @@ i18n.gettext(meson.project_name(), - args: [ - '--directory=' + meson.project_source_root(), - '--from-code=UTF-8', - '-cTRANSLATORS' - ], - preset: 'glib' + args: [ + '--directory=' + meson.project_source_root(), + '--from-code=UTF-8', + '-cTRANSLATORS', + ], + preset: 'glib', ) subdir('extra') diff --git a/src/Daemon/meson.build b/src/Daemon/meson.build index 508d0cf..104030c 100644 --- a/src/Daemon/meson.build +++ b/src/Daemon/meson.build @@ -1,4 +1,4 @@ daemon_files = files( - 'AlarmManager.vala', - 'HourglassDaemon.vala', + 'AlarmManager.vala', + 'HourglassDaemon.vala', ) diff --git a/src/meson.build b/src/meson.build index e77e161..e89d93e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -3,39 +3,41 @@ conf_data.set_quoted('EXEC_NAME', meson.project_name()) conf_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir')) conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) config_file = configure_file( - input: 'Config.vala.in', - output: 'Config.vala', - configuration: conf_data + input: 'Config.vala.in', + output: 'Config.vala', + configuration: conf_data, ) sources = files( - 'Dialogs/MultiSelectPopover.vala', - 'Dialogs/NewAlarmDialog.vala', - 'Objects/Counter.vala', - 'Views/AbstractView.vala', - 'Views/AlarmView.vala', - 'Views/StopwatchView.vala', - 'Views/TimerView.vala', - 'Widgets/Alarm.vala', - 'Window/MainWindow.vala', - 'Hourglass.vala', - 'Utils.vala' + 'Dialogs/MultiSelectPopover.vala', + 'Dialogs/NewAlarmDialog.vala', + 'Objects/Counter.vala', + 'Views/AbstractView.vala', + 'Views/AlarmView.vala', + 'Views/StopwatchView.vala', + 'Views/TimerView.vala', + 'Widgets/Alarm.vala', + 'Window/MainWindow.vala', + 'Hourglass.vala', + 'Utils.vala', ) +dependencies = [ + dependency('gtk4'), + dependency('gee-0.8'), + dependency('granite-7', version: '>= 7.1.0'), + dependency('libportal'), + dependency('libportal-gtk4'), +] + subdir('Daemon') executable( - meson.project_name(), - config_file, - asresources, - sources, - daemon_files, - dependencies: [ - dependency('gtk4'), - dependency('gee-0.8'), - dependency('granite-7', version: '>= 7.1.0'), - dependency('libportal'), - dependency('libportal-gtk4'), - ], - install: true, + meson.project_name(), + config_file, + asresources, + sources, + daemon_files, + dependencies: dependencies, + install: true, )