Meson: modernize data folder

elementary-community · Sep 23, 2024 · 8b49cc6 · 8b49cc6
1 parent d9b5983
commit 8b49cc6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/data/meson.build b/data/meson.build
@@ -2,35 +2,42 @@ icon_sizes = ['24', '32', '48', '64', '128']
 
 foreach i : icon_sizes
     install_data(
-        join_paths('icons', i + '.svg'),
-        install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps'),
+        'icons' / i + '.svg',
+        install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps',
         rename: meson.project_name() + '.svg'
     )
     install_data(
-        join_paths('icons', i + '.svg'),
-        install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2', 'apps'),
+        'icons' / i + '.svg',
+        install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i + '@2' / 'apps',
         rename: meson.project_name() + '.svg'
     )
 endforeach
 
 install_data(
-    meson.project_name() + '.gschema.xml',
-    install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
+    'taxi.gschema.xml',
+    rename: meson.project_name() + '.gschema.xml',
+    install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
 )
 
 i18n.merge_file(
-    input: meson.project_name() + '.desktop.in',
+    input: 'taxi.desktop.in',
     output: meson.project_name() + '.desktop',
-    po_dir: join_paths(meson.source_root(), 'po'),
+    po_dir: meson.source_root() / 'po',
     type: 'desktop',
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'applications')
+    install_dir: get_option('datadir') / 'applications'
 )
 
 i18n.merge_file(
-    input: meson.project_name() + '.appdata.xml.in',
-    output: meson.project_name() + '.appdata.xml',
-    po_dir: join_paths(meson.source_root(), 'po'),
+    input: 'taxi.metainfo.xml.in',
+    output: meson.project_name() + '.metainfo.xml',
+    po_dir: meson.source_root() / 'po',
+    type: 'xml',
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'metainfo')
+    install_dir: get_option('datadir') / 'metainfo'
+)
+
+gresource = gnome.compile_resources(
+    'taxi-resources',
+    'css.gresource.xml'
 )
diff --git a/data/com.github.alecaddd.taxi.desktop.in → data/taxi.desktop.in b/data/com.github.alecaddd.taxi.desktop.in → data/taxi.desktop.in
diff --git a/data/com.github.alecaddd.taxi.gschema.xml → data/taxi.gschema.xml b/data/com.github.alecaddd.taxi.gschema.xml → data/taxi.gschema.xml
diff --git a/data/com.github.alecaddd.taxi.appdata.xml.in → data/taxi.metainfo.xml.in b/data/com.github.alecaddd.taxi.appdata.xml.in → data/taxi.metainfo.xml.in
diff --git a/meson.build b/meson.build
@@ -5,12 +5,6 @@ i18n = import('i18n')
 
 add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name()), language:'c')
 
-asresources = gnome.compile_resources(
-    'as-resources', 'data/css.gresource.xml',
-    source_dir: 'data',
-    c_name: 'as'
-)
-
 vala_lint = find_program('io.elementary.vala-lint', required : false)
 if vala_lint.found()
     test (
@@ -20,8 +14,8 @@ if vala_lint.found()
     )
 endif
 
-subdir('src')
 subdir('data')
+subdir('src')
 subdir('po')
 
 meson.add_install_script('meson/post_install.py')
diff --git a/src/meson.build b/src/meson.build
@@ -20,7 +20,7 @@ executable(
     'Frontend/Widgets/OperationsPopover.vala',
     'Frontend/Widgets/PathBarSeparator.vala',
     'Frontend/Widgets/PathBar.vala',
-    asresources,
+    gresource,
     dependencies: [
         dependency('glib-2.0'),
         dependency('gobject-2.0'),