[eog: 1/21] build: Simplify icons installation procedure



commit d9dd7df6839e61723d3fedb5be40d55137e319bf
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Jun 27 13:21:41 2019 +0200

    build: Simplify icons installation procedure

 data/icons/meson.build | 44 +++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)
---
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 51996141..34a4f397 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,40 +1,22 @@
-icon_sizes = [
-  'scalable'
-]
-
-foreach icon_size: icon_sizes
-  install_subdir(
-    join_paths(icon_size, 'apps'),
-    install_dir: join_paths(eog_datadir, 'icons', 'hicolor', icon_size)
-  )
-endforeach
-
-install_data(
-  'symbolic/apps/org.gnome.eog-symbolic.svg',
-  install_dir: join_paths(eog_datadir, 'icons', 'hicolor', 'symbolic', 'apps')
+install_subdir(
+  'scalable/apps',
+  install_dir: join_paths(eog_datadir, 'icons/hicolor/scalable')
 )
 
-icon_sizes = [
-  ['16x16', ['slideshow-play.png', 'eog-plugin.png']],
-  ['22x22', ['slideshow-play.png', 'eog-plugin.png']],
-  ['24x24', ['slideshow-play.png']],
-  ['32x32', ['slideshow-play.png', 'eog-plugin.png']],
-  ['48x48', ['slideshow-play.png']]
-]
-
-foreach icon_size: icon_sizes
-  actions_icons = []
-  foreach file: icon_size[1]
-    actions_icons += files(join_paths(icon_size[0], 'actions', file))
-  endforeach
+install_subdir(
+  'symbolic',
+  install_dir: join_paths(eog_datadir, 'icons/hicolor')
+)
 
-  install_data(
-    actions_icons,
-    install_dir: join_paths(eog_pkgdatadir, 'icons', 'hicolor', icon_size[0], 'actions')
+foreach icon_size: ['16x16', '22x22', '24x24', '32x32', '48x48']
+  install_subdir(
+    join_paths(icon_size, 'actions'),
+    install_dir: join_paths(eog_pkgdatadir, 'icons/hicolor', icon_size),
+    exclude_files: ['eog-plugin.svg', 'slideshow-play.svg', 'eog-image-gallery.svg']
   )
 endforeach
 
 install_subdir(
   'scalable/actions',
-  install_dir: join_paths(eog_pkgdatadir, 'icons', 'hicolor', 'scalable')
+  install_dir: join_paths(eog_pkgdatadir, 'icons/hicolor/scalable')
 )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]