Improve meson

.editorconfig

@@ -0,0 +1,16 @@
+# EditorConfig <https://EditorConfig.org>
+root = true
+
+# elementary defaults
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = tab
+indent_style = space
+insert_final_newline = true
+max_line_length = 80
+tab_width = 4
+
+# Markup files
+[{*.html,*.xml,*.xml.in,*.yml}]
+tab_width = 2

data/meson.build

@@ -1,23 +1,27 @@
-icon_sizes = ['24', '32', '48', '64', '128']
+icon_sizes = ['16', '24', '32', '48', '64', '128']
 
 foreach i : icon_sizes
-install_data(
-join_paths('icons', i, meson.project_name() + '.svg'),
-install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps')
-)
+    install_data(
+        join_paths('icons', i, meson.project_name() + '.svg'),
+        install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps')
+    )
+    install_data(
+        join_paths('icons', i, meson.project_name() + '.svg'),
+        install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2', 'apps')
+    )
 endforeach
 
 install_data(
-meson.project_name() + '.desktop',
-install_dir: join_paths(get_option('datadir'), 'applications')
+    meson.project_name() + '.desktop',
+    install_dir: join_paths(get_option('datadir'), 'applications')
 )
 
 install_data(
-meson.project_name() + '.appdata.xml',
-install_dir: join_paths(get_option('datadir'), 'metainfo')
+    meson.project_name() + '.appdata.xml',
+    install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
 
 install_data(
-meson.project_name() + '.contract',
-install_dir: join_paths(get_option('datadir'), 'contractor')
+    meson.project_name() + '.contract',
+    install_dir: join_paths(get_option('datadir'), 'contractor')
 )

meson.build

@@ -1,32 +1,29 @@
-project('com.github.philip-scott.wallpaperize', ['vala', 'c'],
-    version: '0.2.0'
-)
+project('com.github.philip-scott.wallpaperize', 'vala', 'c', version: '0.2.0')
 
 gnome = import('gnome')
 i18n = import('i18n')
 
-conf = configuration_data()
-conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-configure_file(output: 'config.h', configuration: conf)
-config_h_dir = include_directories('.')
+add_project_arguments(
+    '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
+    language: 'c'
+)
 
-c_args = [
-  '-include', 'config.h',
+dependencies = [
+    dependency('glib-2.0'),
+    dependency('gobject-2.0'),
+    dependency('gtk+-3.0'),
+    dependency('granite')
 ]
 
+subdir('src')
+
 executable(
-    'com.github.philip-scott.wallpaperize',
-    'src/Application.vala',
-    'src/Wallpaperize.vala',
-    'src/Window.vala',
-    c_args: c_args,
-    dependencies: [
-        dependency('glib-2.0'),
-        dependency('gobject-2.0'),
-        dependency('gtk+-3.0'),
-        dependency('granite'),
-    ],
+    meson.project_name(),   
+    sources,
+    dependencies: dependencies,
     install : true
 )
 
 subdir('data')
+
+meson.add_install_script('meson/post_install.py')

meson/post_install.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+from os import path, environ
+import subprocess
+
+prefix = environ.get('MESON_INSTALL_PREFIX', '/usr/local')
+schemadir = path.join(environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
+datadir = path.join(prefix, 'share')
+desktop_database_dir = path.join(datadir, 'applications')
+
+if not environ.get('DESTDIR'):
+    print('Compiling gsettings schemas…')
+    subprocess.call(['glib-compile-schemas', schemadir])
+    print('Updating desktop database…')
+    subprocess.call(['update-desktop-database', '-q', desktop_database_dir])
+    print('Updating icon cache…')
+    subprocess.call(['gtk-update-icon-cache', '-qtf', path.join(datadir, 'icons', 'hicolor')])

src/meson.build

@@ -0,0 +1,5 @@
+sources = files(
+    'Application.vala',
+    'Wallpaperize.vala',
+    'Window.vala'
+)