[gnome-online-accounts/wip/inigomartinez/meson: 134/134] build: Relocate icons' directories



commit 7e26afe79755a2785d0c2b4cfb02efe8d781b771
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Mon Sep 11 13:54:59 2017 +0200

    build: Relocate icons' directories
    
    This patch relocates icons' files into the directories that they
    are going to be installed, avoiding the need to process directories
    or files individually, which makes the installation process faster.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=787638

 .../16x16/apps}/goa-account-facebook.png           |  Bin 561 -> 561 bytes
 .../16x16/apps}/goa-account-flickr.png             |  Bin 594 -> 594 bytes
 .../16x16/apps}/goa-account-foursquare.png         |  Bin 735 -> 735 bytes
 .../16x16/apps}/goa-account-google.png             |  Bin 720 -> 720 bytes
 .../16x16/apps}/goa-account-msn.png                |  Bin 490 -> 490 bytes
 .../16x16/apps}/goa-account-owncloud.png           |  Bin 704 -> 704 bytes
 .../16x16/apps}/goa-account-pocket.png             |  Bin 662 -> 662 bytes
 .../16x16/apps}/goa-account-todoist.png            |  Bin 740 -> 740 bytes
 .../{16x16 => hicolor/16x16/apps}/goa-account.png  |  Bin 174 -> 174 bytes
 .../22x22/apps}/goa-account-facebook.png           |  Bin 730 -> 730 bytes
 .../22x22/apps}/goa-account-flickr.png             |  Bin 763 -> 763 bytes
 .../22x22/apps}/goa-account-foursquare.png         |  Bin 967 -> 967 bytes
 .../22x22/apps}/goa-account-google.png             |  Bin 918 -> 918 bytes
 .../22x22/apps}/goa-account-msn.png                |  Bin 614 -> 614 bytes
 .../22x22/apps}/goa-account-owncloud.png           |  Bin 932 -> 932 bytes
 .../22x22/apps}/goa-account-pocket.png             |  Bin 863 -> 863 bytes
 .../22x22/apps}/goa-account-todoist.png            |  Bin 948 -> 948 bytes
 .../{22x22 => hicolor/22x22/apps}/goa-account.png  |  Bin 179 -> 179 bytes
 .../24x24/apps}/goa-account-facebook.png           |  Bin 752 -> 752 bytes
 .../24x24/apps}/goa-account-flickr.png             |  Bin 784 -> 784 bytes
 .../24x24/apps}/goa-account-foursquare.png         |  Bin 990 -> 990 bytes
 .../24x24/apps}/goa-account-google.png             |  Bin 932 -> 932 bytes
 .../24x24/apps}/goa-account-msn.png                |  Bin 638 -> 638 bytes
 .../24x24/apps}/goa-account-owncloud.png           |  Bin 1009 -> 1009 bytes
 .../24x24/apps}/goa-account-pocket.png             |  Bin 894 -> 894 bytes
 .../24x24/apps}/goa-account-todoist.png            |  Bin 972 -> 972 bytes
 .../{24x24 => hicolor/24x24/apps}/goa-account.png  |  Bin 180 -> 180 bytes
 .../256x256/apps}/goa-account.png                  |  Bin 433 -> 433 bytes
 .../32x32/apps}/goa-account-facebook.png           |  Bin 987 -> 987 bytes
 .../32x32/apps}/goa-account-flickr.png             |  Bin 941 -> 941 bytes
 .../32x32/apps}/goa-account-foursquare.png         |  Bin 1383 -> 1383 bytes
 .../32x32/apps}/goa-account-google.png             |  Bin 1186 -> 1186 bytes
 .../32x32/apps}/goa-account-msn.png                |  Bin 690 -> 690 bytes
 .../32x32/apps}/goa-account-owncloud.png           |  Bin 1336 -> 1336 bytes
 .../32x32/apps}/goa-account-pocket.png             |  Bin 1228 -> 1228 bytes
 .../32x32/apps}/goa-account-todoist.png            |  Bin 1377 -> 1377 bytes
 .../{32x32 => hicolor/32x32/apps}/goa-account.png  |  Bin 182 -> 182 bytes
 .../48x48/apps}/goa-account-facebook.png           |  Bin 1184 -> 1184 bytes
 .../48x48/apps}/goa-account-flickr.png             |  Bin 1325 -> 1325 bytes
 .../48x48/apps}/goa-account-foursquare.png         |  Bin 1906 -> 1906 bytes
 .../48x48/apps}/goa-account-google.png             |  Bin 1573 -> 1573 bytes
 .../48x48/apps}/goa-account-msn.png                |  Bin 807 -> 807 bytes
 .../48x48/apps}/goa-account-owncloud.png           |  Bin 1637 -> 1637 bytes
 .../48x48/apps}/goa-account-pocket.png             |  Bin 1518 -> 1518 bytes
 .../48x48/apps}/goa-account-todoist.png            |  Bin 2022 -> 2022 bytes
 .../{48x48 => hicolor/48x48/apps}/goa-account.png  |  Bin 187 -> 187 bytes
 .../96x96/apps}/goa-account-facebook.png           |  Bin 3023 -> 3023 bytes
 .../96x96/apps}/goa-account-flickr.png             |  Bin 3039 -> 3039 bytes
 .../96x96/apps}/goa-account-foursquare.png         |  Bin 4409 -> 4409 bytes
 .../96x96/apps}/goa-account-google.png             |  Bin 3363 -> 3363 bytes
 .../96x96/apps}/goa-account-msn.png                |  Bin 1880 -> 1880 bytes
 .../96x96/apps}/goa-account-owncloud.png           |  Bin 3933 -> 3933 bytes
 .../96x96/apps}/goa-account-pocket.png             |  Bin 3584 -> 3584 bytes
 .../96x96/apps}/goa-account-todoist.png            |  Bin 4512 -> 4512 bytes
 .../{96x96 => hicolor/96x96/apps}/goa-account.png  |  Bin 282 -> 282 bytes
 data/icons/meson.build                             |   38 ++-----------------
 56 files changed, 4 insertions(+), 34 deletions(-)
---
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 866e2f9..4535ad2 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,34 +1,4 @@
-icon_data = [
-  'goa-account-facebook.png',
-  'goa-account-flickr.png',
-  'goa-account-foursquare.png',
-  'goa-account-google.png',
-  'goa-account-msn.png',
-  'goa-account-owncloud.png',
-  'goa-account.png',
-  'goa-account-pocket.png',
-  'goa-account-todoist.png'
-]
-
-icon_data_256 = ['goa-account.png']
-
-icons = [
-  ['16x16', icon_data],
-  ['22x22', icon_data],
-  ['24x24', icon_data],
-  ['32x32', icon_data],
-  ['48x48', icon_data],
-  ['96x96', icon_data],
-  ['256x256', icon_data_256]
-]
-
-foreach icon: icons
-  icon_dir = join_paths(goa_datadir, 'icons', 'hicolor', icon[0], 'apps')
-
-  foreach data: icon[1]
-    install_data(
-      join_paths(icon[0], data),
-      install_dir: icon_dir
-    )
-  endforeach
-endforeach
+install_subdir(
+  'hicolor',
+  install_dir: join_paths(goa_datadir, 'icons')
+)


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