Merge branch 'trunk' of git.ddd.rip:zerica/audrey into trunk

data/icons/meson.build

@@ -3,11 +3,11 @@ application_id = 'eu.callcc.audrey'
 scalable_dir = 'hicolor' / 'scalable' / 'apps'
 install_data(
   scalable_dir / ('@0@.svg').format(application_id),
-  install_dir: get_option('datadir') / 'icons' / scalable_dir
+  install_dir: get_option('datadir') / 'icons' / scalable_dir,
 )
 
 symbolic_dir = 'hicolor' / 'symbolic' / 'apps'
 install_data(
   symbolic_dir / ('@0@-symbolic.svg').format(application_id),
-  install_dir: get_option('datadir') / 'icons' / symbolic_dir
+  install_dir: get_option('datadir') / 'icons' / symbolic_dir,
 )

data/meson.build

@@ -1,10 +1,10 @@
 desktop_file = i18n.merge_file(
-        input: 'eu.callcc.audrey.desktop.in',
+  input: 'eu.callcc.audrey.desktop.in',
-       output: 'eu.callcc.audrey.desktop',
+  output: 'eu.callcc.audrey.desktop',
-         type: 'desktop',
+  type: 'desktop',
-       po_dir: '../po',
+  po_dir: '../po',
-      install: true,
+  install: true,
-  install_dir: get_option('datadir') / 'applications'
+  install_dir: get_option('datadir') / 'applications',
 )
 
 desktop_utils = find_program('desktop-file-validate', required: false)
@@ -13,25 +13,35 @@ if desktop_utils.found()
 endif
 
 appstream_file = i18n.merge_file(
-        input: 'eu.callcc.audrey.metainfo.xml.in',
+  input: 'eu.callcc.audrey.metainfo.xml.in',
-       output: 'eu.callcc.audrey.metainfo.xml',
+  output: 'eu.callcc.audrey.metainfo.xml',
-       po_dir: '../po',
+  po_dir: '../po',
-      install: true,
+  install: true,
-  install_dir: get_option('datadir') / 'metainfo'
+  install_dir: get_option('datadir') / 'metainfo',
 )
 
 appstreamcli = find_program('appstreamcli', required: false, disabler: true)
-test('Validate appstream file', appstreamcli,
+test(
-     args: ['validate', '--no-net', '--explain', appstream_file])
+  'Validate appstream file',
-
+  appstreamcli,
-install_data('eu.callcc.audrey.gschema.xml',
+  args: ['validate', '--no-net', '--explain', appstream_file],
-  install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
 )
 
-compile_schemas = find_program('glib-compile-schemas', required: false, disabler: true)
+install_data(
-test('Validate schema file',
+  'eu.callcc.audrey.gschema.xml',
-     compile_schemas,
+  install_dir: get_option('datadir') / 'glib-2.0' / 'schemas',
-     args: ['--strict', '--dry-run', meson.current_source_dir()])
+)
+
+compile_schemas = find_program(
+  'glib-compile-schemas',
+  required: false,
+  disabler: true,
+)
+test(
+  'Validate schema file',
+  compile_schemas,
+  args: ['--strict', '--dry-run', meson.current_source_dir()],
+)
 
 
 service_conf = configuration_data()
@@ -40,7 +50,7 @@ configure_file(
   input: 'eu.callcc.audrey.service.in',
   output: 'eu.callcc.audrey.service',
   configuration: service_conf,
-  install_dir: get_option('datadir') / 'dbus-1' / 'services'
+  install_dir: get_option('datadir') / 'dbus-1' / 'services',
 )
 
 subdir('icons')

meson.build

@@ -1,7 +1,9 @@
-project('audrey', ['c', 'vala'],
+project(
-          version: '0.1.0', # AUDREY_VERSION
+  'audrey',
-    meson_version: '>= 1.0.0',
+  ['c', 'vala'],
-  default_options: [ 'warning_level=0', 'werror=false', ],
+  version: '0.1.0',  # AUDREY_VERSION
+  meson_version: '>= 1.0.0',
+  default_options: ['warning_level=0', 'werror=false'],
 )
 
 i18n = import('i18n')
@@ -12,15 +14,18 @@ valac = meson.get_compiler('vala')
 srcdir = meson.project_source_root() / 'src'
 
 config_h = configuration_data()
-config_h.set_quoted('PACKAGE_VERSION', meson.project_version ())
+config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
 config_h.set_quoted('GETTEXT_PACKAGE', 'audrey')
 config_h.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
 configure_file(output: 'config.h', configuration: config_h)
 
-config_dep = valac.find_library ('config', dirs: srcdir)
+config_dep = valac.find_library('config', dirs: srcdir)
 config_inc = include_directories('.')
 
-add_project_arguments('-DGETTEXT_PACKAGE="' + meson.project_name () + '"', language: 'c')
+add_project_arguments(
+  '-DGETTEXT_PACKAGE="' + meson.project_name() + '"',
+  language: 'c',
+)
 
 
 subdir('data')
@@ -28,7 +33,7 @@ subdir('src')
 subdir('po')
 
 gnome.post_install(
-     glib_compile_schemas: true,
+  glib_compile_schemas: true,
-    gtk_update_icon_cache: true,
+  gtk_update_icon_cache: true,
   update_desktop_database: true,
 )

meson.format

@@ -0,0 +1 @@
+indent_by = '  '

src/meson.build

@@ -20,17 +20,10 @@ audrey_deps = [
   dependency('sqlite3'),
 ]
 
-blueprints = custom_target('blueprints',
+blueprints = custom_target(
-  input: files(
+  'blueprints',
-    'ui/play_queue.blp',
+  input: files('ui/play_queue.blp', 'ui/setup.blp', 'ui/window.blp'),
-    'ui/setup.blp',
+  output: ['play_queue.ui', 'setup.ui', 'window.ui'],
-    'ui/window.blp',
-  ),
-  output: [
-    'play_queue.ui',
-    'setup.ui',
-    'window.ui',
-  ],
   command: [
     find_program('blueprint-compiler'),
     'batch-compile',
@@ -40,14 +33,17 @@ blueprints = custom_target('blueprints',
   ],
 )
 
-audrey_sources += gnome.compile_resources('audrey-resources',
+audrey_sources += gnome.compile_resources(
+  'audrey-resources',
   'audrey.gresource.xml',
   c_name: 'audrey',
   dependencies: blueprints,
 )
 
-executable('audrey', audrey_sources,
+executable(
+  'audrey',
+  audrey_sources,
   dependencies: audrey_deps,
   include_directories: config_inc,
-       install: true,
+  install: true,
 )