raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ef2fb5c4f9e7895d5df2b5121dca2b98352b4ac0
commit ef2fb5c4f9e7895d5df2b5121dca2b98352b4ac0
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu Aug 10 23:40:56 2017 +0900
meson build - trim down some data file build files a little
---
data/backgrounds/meson.build | 81 ++++++++--------
data/desktop/meson.build | 13 +--
data/favorites/meson.build | 19 ++--
data/flags/meson.build | 207 ++++++++++++++++++++---------------------
data/icons/meson.build | 29 +++---
data/images/meson.build | 19 ++--
data/input_methods/meson.build | 23 ++---
data/tools/meson.build | 10 +-
data/units/meson.build | 12 +--
data/xsession/meson.build | 13 ++-
10 files changed, 200 insertions(+), 226 deletions(-)
diff --git a/data/backgrounds/meson.build b/data/backgrounds/meson.build
index ae6e11766..36ce329ae 100644
--- a/data/backgrounds/meson.build
+++ b/data/backgrounds/meson.build
@@ -1,42 +1,39 @@
-backgrounds_dist = [
- 'Brown_Rock_Hi.edj',
- 'Colorful_Roses.edj',
- 'Darkconcrete.edj',
- 'Dark_Gradient.edj',
- 'Grassy.edj',
- 'Japanesemaple.edj',
- 'Lakegrass.edj',
- 'Light_Gradient.edj',
- 'Mossstring.edj',
- 'Motleyrock.edj',
- 'Newgrowth.edj',
- 'Orange_Roses.edj',
- 'Pattern_Radial.edj',
- 'Pattern_Vertical.edj',
- 'Pattern_Vertical_Hi.edj',
- 'Pine_Silhouettes.edj',
- 'Purple_Flower_Bunch.edj',
- 'Skywall.edj',
- 'Stringflower.edj',
- 'Wetgrass.edj',
- 'Wetleaf.edj',
- 'Whiterock.edj',
- 'Hills.edj',
- 'Light.edj',
- 'Temple.edj',
- 'Train.edj',
- 'Curly_Leaves.edj',
- 'Flower_Petals.edj',
- 'Go_Away.edj',
- 'Green_Stem.edj',
- 'Leafy_Red.edj',
- 'Ramen.edj',
- 'Shady_Leaves.edj',
- 'Windy_Palm.edj',
- 'Lantern_Cluster.edj',
- 'Wall_Lanterns.edj'
-]
-
-install_data(backgrounds_dist,
- install_dir: join_paths(dir_data, 'enlightenment/data/backgrounds')
-)
+install_data([ 'Brown_Rock_Hi.edj',
+ 'Colorful_Roses.edj',
+ 'Darkconcrete.edj',
+ 'Dark_Gradient.edj',
+ 'Grassy.edj',
+ 'Japanesemaple.edj',
+ 'Lakegrass.edj',
+ 'Light_Gradient.edj',
+ 'Mossstring.edj',
+ 'Motleyrock.edj',
+ 'Newgrowth.edj',
+ 'Orange_Roses.edj',
+ 'Pattern_Radial.edj',
+ 'Pattern_Vertical.edj',
+ 'Pattern_Vertical_Hi.edj',
+ 'Pine_Silhouettes.edj',
+ 'Purple_Flower_Bunch.edj',
+ 'Skywall.edj',
+ 'Stringflower.edj',
+ 'Wetgrass.edj',
+ 'Wetleaf.edj',
+ 'Whiterock.edj',
+ 'Hills.edj',
+ 'Light.edj',
+ 'Temple.edj',
+ 'Train.edj',
+ 'Curly_Leaves.edj',
+ 'Flower_Petals.edj',
+ 'Go_Away.edj',
+ 'Green_Stem.edj',
+ 'Leafy_Red.edj',
+ 'Ramen.edj',
+ 'Shady_Leaves.edj',
+ 'Windy_Palm.edj',
+ 'Lantern_Cluster.edj',
+ 'Wall_Lanterns.edj'
+ ],
+ install_dir: join_paths(dir_data,
'enlightenment/data/backgrounds')
+ )
diff --git a/data/desktop/meson.build b/data/desktop/meson.build
index 824f7bf2d..442b20d4d 100644
--- a/data/desktop/meson.build
+++ b/data/desktop/meson.build
@@ -1,8 +1,5 @@
-desktop_dist = [
- 'enlightenment_filemanager.desktop',
- 'enlightenment_askpass.desktop'
-]
-
-install_data(desktop_dist,
- install_dir: join_paths(dir_data, 'applications')
-)
+install_data([ 'enlightenment_filemanager.desktop',
+ 'enlightenment_askpass.desktop'
+ ],
+ install_dir: join_paths(dir_data, 'applications')
+ )
diff --git a/data/favorites/meson.build b/data/favorites/meson.build
index be8ffc581..85793a604 100644
--- a/data/favorites/meson.build
+++ b/data/favorites/meson.build
@@ -1,11 +1,8 @@
-favorites_dist = [
- '.order',
- 'desktop.desktop',
- 'home.desktop',
- 'root.desktop',
- 'tmp.desktop'
-]
-
-install_data(favorites_dist,
- install_dir: join_paths(dir_data, 'enlightenment/data/favorites')
-)
+install_data([ '.order',
+ 'desktop.desktop',
+ 'home.desktop',
+ 'root.desktop',
+ 'tmp.desktop'
+ ],
+ install_dir: join_paths(dir_data, 'enlightenment/data/favorites')
+ )
diff --git a/data/flags/meson.build b/data/flags/meson.build
index fd5017198..aa322c067 100644
--- a/data/flags/meson.build
+++ b/data/flags/meson.build
@@ -1,105 +1,102 @@
-flags_dist = [
- 'ad_flag.png',
- 'af_flag.png',
- 'al_flag.png',
- 'am_flag.png',
- 'ara_flag.png',
- 'ar_flag.png',
- 'at_flag.png',
- 'az_flag.png',
- 'ba_flag.png',
- 'bd_flag.png',
- 'be_flag.png',
- 'bg_flag.png',
- 'brai_flag.png',
- 'br_flag.png',
- 'bt_flag.png',
- 'bw_flag.png',
- 'by_flag.png',
- 'ca_flag.png',
- 'cat_flag.png',
- 'cd_flag.png',
- 'ch_flag.png',
- 'cm_flag.png',
- 'cn_flag.png',
- 'cz_flag.png',
- 'de_flag.png',
- 'dk_flag.png',
- 'ee_flag.png',
- 'epo_flag.png',
- 'es_flag.png',
- 'et_flag.png',
- 'fi_flag.png',
- 'fo_flag.png',
- 'fr_flag.png',
- 'gb_flag.png',
- 'ge_flag.png',
- 'gh_flag.png',
- 'gn_flag.png',
- 'gr_flag.png',
- 'hr_flag.png',
- 'hu_flag.png',
- 'ie_flag.png',
- 'il_flag.png',
- 'in_flag.png',
- 'iq_flag.png',
- 'ir_flag.png',
- 'is_flag.png',
- 'it_flag.png',
- 'jp_flag.png',
- 'ke_flag.png',
- 'kg_flag.png',
- 'kh_flag.png',
- 'kr_flag.png',
- 'ku_flag.png',
- 'kz_flag.png',
- 'la_flag.png',
- 'lang-system.png',
- 'latam_flag.png',
- 'lk_flag.png',
- 'lt_flag.png',
- 'lv_flag.png',
- 'ma_flag.png',
- 'mao_flag.png',
- 'md_flag.png',
- 'me_flag.png',
- 'mk_flag.png',
- 'ml_flag.png',
- 'mm_flag.png',
- 'mn_flag.png',
- 'mt_flag.png',
- 'mv_flag.png',
- 'my_flag.png',
- 'ng_flag.png',
- 'nl_flag.png',
- 'no_flag.png',
- 'np_flag.png',
- 'ph_flag.png',
- 'pk_flag.png',
- 'pl_flag.png',
- 'pt_flag.png',
- 'ro_flag.png',
- 'rs_flag.png',
- 'ru_flag.png',
- 'se_flag.png',
- 'si_flag.png',
- 'sk_flag.png',
- 'sn_flag.png',
- 'sy_flag.png',
- 'th_flag.png',
- 'tj_flag.png',
- 'tm_flag.png',
- 'tr_flag.png',
- 'tw_flag.png',
- 'tz_flag.png',
- 'ua_flag.png',
- 'unknown_flag.png',
- 'us_flag.png',
- 'uz_flag.png',
- 'vn_flag.png',
- 'za_flag.png'
-]
-
-install_data(flags_dist,
- install_dir: join_paths(dir_data, 'enlightenment/data/flags')
-)
+install_data([ 'ad_flag.png',
+ 'af_flag.png',
+ 'al_flag.png',
+ 'am_flag.png',
+ 'ara_flag.png',
+ 'ar_flag.png',
+ 'at_flag.png',
+ 'az_flag.png',
+ 'ba_flag.png',
+ 'bd_flag.png',
+ 'be_flag.png',
+ 'bg_flag.png',
+ 'brai_flag.png',
+ 'br_flag.png',
+ 'bt_flag.png',
+ 'bw_flag.png',
+ 'by_flag.png',
+ 'ca_flag.png',
+ 'cat_flag.png',
+ 'cd_flag.png',
+ 'ch_flag.png',
+ 'cm_flag.png',
+ 'cn_flag.png',
+ 'cz_flag.png',
+ 'de_flag.png',
+ 'dk_flag.png',
+ 'ee_flag.png',
+ 'epo_flag.png',
+ 'es_flag.png',
+ 'et_flag.png',
+ 'fi_flag.png',
+ 'fo_flag.png',
+ 'fr_flag.png',
+ 'gb_flag.png',
+ 'ge_flag.png',
+ 'gh_flag.png',
+ 'gn_flag.png',
+ 'gr_flag.png',
+ 'hr_flag.png',
+ 'hu_flag.png',
+ 'ie_flag.png',
+ 'il_flag.png',
+ 'in_flag.png',
+ 'iq_flag.png',
+ 'ir_flag.png',
+ 'is_flag.png',
+ 'it_flag.png',
+ 'jp_flag.png',
+ 'ke_flag.png',
+ 'kg_flag.png',
+ 'kh_flag.png',
+ 'kr_flag.png',
+ 'ku_flag.png',
+ 'kz_flag.png',
+ 'la_flag.png',
+ 'lang-system.png',
+ 'latam_flag.png',
+ 'lk_flag.png',
+ 'lt_flag.png',
+ 'lv_flag.png',
+ 'ma_flag.png',
+ 'mao_flag.png',
+ 'md_flag.png',
+ 'me_flag.png',
+ 'mk_flag.png',
+ 'ml_flag.png',
+ 'mm_flag.png',
+ 'mn_flag.png',
+ 'mt_flag.png',
+ 'mv_flag.png',
+ 'my_flag.png',
+ 'ng_flag.png',
+ 'nl_flag.png',
+ 'no_flag.png',
+ 'np_flag.png',
+ 'ph_flag.png',
+ 'pk_flag.png',
+ 'pl_flag.png',
+ 'pt_flag.png',
+ 'ro_flag.png',
+ 'rs_flag.png',
+ 'ru_flag.png',
+ 'se_flag.png',
+ 'si_flag.png',
+ 'sk_flag.png',
+ 'sn_flag.png',
+ 'sy_flag.png',
+ 'th_flag.png',
+ 'tj_flag.png',
+ 'tm_flag.png',
+ 'tr_flag.png',
+ 'tw_flag.png',
+ 'tz_flag.png',
+ 'ua_flag.png',
+ 'unknown_flag.png',
+ 'us_flag.png',
+ 'uz_flag.png',
+ 'vn_flag.png',
+ 'za_flag.png'
+ ],
+ install_dir: join_paths(dir_data, 'enlightenment/data/flags')
+ )
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 05fd5925e..63ab8292c 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,18 +1,15 @@
-icons_dist = [
- 'xterm.png',
- 'web_browser.png',
- 'audio_player.png',
- 'mail_client.png',
- 'video_player.png',
- 'text_editor.png',
- 'image_viewer.png',
- 'audio_player2.png'
-]
-
-install_data(icons_dist,
- install_dir: join_paths(dir_data, 'enlightenment/data/icons')
-)
+install_data([ 'xterm.png',
+ 'web_browser.png',
+ 'audio_player.png',
+ 'mail_client.png',
+ 'video_player.png',
+ 'text_editor.png',
+ 'image_viewer.png',
+ 'audio_player2.png'
+ ],
+ install_dir: join_paths(dir_data, 'enlightenment/data/icons')
+ )
install_data('enlightenment-askpass.png',
- install_dir: join_paths(dir_data, 'pixmaps')
-)
+ install_dir: join_paths(dir_data, 'pixmaps')
+ )
diff --git a/data/images/meson.build b/data/images/meson.build
index 944c03bf1..5cdafec8e 100644
--- a/data/images/meson.build
+++ b/data/images/meson.build
@@ -1,11 +1,8 @@
-images_dist = [
- 'enlightenment.png',
- 'test.png',
- 'test.jpg',
- 'test.edj',
- 'test.svg'
-]
-
-install_data(images_dist,
- install_dir: join_paths(dir_data, 'enlightenment/data/images')
-)
+install_data([ 'enlightenment.png',
+ 'test.png',
+ 'test.jpg',
+ 'test.edj',
+ 'test.svg'
+ ],
+ install_dir: join_paths(dir_data, 'enlightenment/data/images')
+ )
diff --git a/data/input_methods/meson.build b/data/input_methods/meson.build
index 147abdb71..f75e0f09a 100644
--- a/data/input_methods/meson.build
+++ b/data/input_methods/meson.build
@@ -1,13 +1,10 @@
-input_methods_dist = [
- 'scim.imc',
- 'uim.imc',
- 'iiimf.imc',
- 'ibus.imc',
- 'gcin.imc',
- 'hime.imc',
- 'fcitx.imc'
-]
-
-install_data(input_methods_dist,
- install_dir: join_paths(dir_data, 'enlightenment/data/input_methods')
-)
+install_data([ 'scim.imc',
+ 'uim.imc',
+ 'iiimf.imc',
+ 'ibus.imc',
+ 'gcin.imc',
+ 'hime.imc',
+ 'fcitx.imc'
+ ],
+ install_dir: join_paths(dir_data,
'enlightenment/data/input_methods')
+ )
diff --git a/data/tools/meson.build b/data/tools/meson.build
index 212851082..3b39ab279 100644
--- a/data/tools/meson.build
+++ b/data/tools/meson.build
@@ -1,7 +1,3 @@
-tools_dist = [
- 'enlightenment_remote'
-]
-
-install_data(tools_dist,
- install_dir: dir_bin
-)
+install_data('enlightenment_remote',
+ install_dir: dir_bin
+ )
diff --git a/data/units/meson.build b/data/units/meson.build
index a30265b13..ac388bbe3 100644
--- a/data/units/meson.build
+++ b/data/units/meson.build
@@ -1,8 +1,8 @@
if get_option('systemd') == true
- configure_file(input: 'enlightenment.service.in',
- output: 'enlightenment.service',
- install: true,
- install_dir: systemd_unitdir,
- configuration: config_h
- )
+ configure_file(input : 'enlightenment.service.in',
+ output : 'enlightenment.service',
+ install : true,
+ install_dir : systemd_unitdir,
+ configuration: config_h
+ )
endif
diff --git a/data/xsession/meson.build b/data/xsession/meson.build
index 2a07a0ee3..dbf3f22ff 100644
--- a/data/xsession/meson.build
+++ b/data/xsession/meson.build
@@ -1,9 +1,8 @@
desktop_config = configuration_data()
desktop_config.set('prefix', dir_prefix)
-
-configure_file(input: 'enlightenment.desktop.in',
- output: 'enlightenment.desktop',
- install: true,
- install_dir: join_paths(dir_data, 'xsessions'),
- configuration: desktop_config
-)
+configure_file(input : 'enlightenment.desktop.in',
+ output : 'enlightenment.desktop',
+ install : true,
+ install_dir : join_paths(dir_data, 'xsessions'),
+ configuration: desktop_config
+ )
--
