This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch dev/dimmus/test
in repository efl.
View the commit online.
commit 8960e452f02ccc578e9e89d33519675feb6bc354
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 7 12:41:18 2024 +0500
meson: join_path - clean data
---
data/edje/include/meson.build | 2 +-
data/edje/meson.build | 2 +-
data/elementary/colors/meson.build | 2 +-
data/elementary/config/default/meson.build | 2 +-
data/elementary/config/meson.build | 10 +++++-----
data/elementary/config/mobile/meson.build | 2 +-
data/elementary/config/standard/meson.build | 2 +-
data/elementary/desktop/meson.build | 4 ++--
data/elementary/edje_externals/meson.build | 4 ++--
data/elementary/meson.build | 2 +-
data/elementary/objects/meson.build | 8 ++++----
data/elementary/themes/meson.build | 30 ++++++++++++++---------------
data/embryo/meson.build | 2 +-
data/eo/meson.build | 4 ++--
data/ethumb/frames/meson.build | 8 ++++----
data/evas/meson.build | 2 +-
data/meson.build | 6 +++---
17 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/data/edje/include/meson.build b/data/edje/include/meson.build
index 943eb8a6c9..57eb4f4166 100644
--- a/data/edje/include/meson.build
+++ b/data/edje/include/meson.build
@@ -1,3 +1,3 @@
install_data('edje.inc',
- install_dir : join_paths(dir_data, 'edje', 'include')
+ install_dir : dir_data / 'edje/include'
)
\ No newline at end of file
diff --git a/data/edje/meson.build b/data/edje/meson.build
index 05f4f39a03..416f9442ce 100644
--- a/data/edje/meson.build
+++ b/data/edje/meson.build
@@ -1,5 +1,5 @@
subdir('include')
install_data(files('edje.xml'),
- install_dir : join_paths(dir_data, 'mime', 'packages')
+ install_dir : dir_data / 'mime/packages'
)
diff --git a/data/elementary/colors/meson.build b/data/elementary/colors/meson.build
index 4188df5479..e89571a705 100644
--- a/data/elementary/colors/meson.build
+++ b/data/elementary/colors/meson.build
@@ -14,6 +14,6 @@ foreach p: pals
output: p + '.pal',
command: [eet_bin, '-e', '@OUTPUT@', 'palette', '@INPUT@', '1'],
install: true,
- install_dir: join_paths(dir_data, 'elementary', 'colors'),
+ install_dir: dir_data / 'elementary/colors',
)
endforeach
diff --git a/data/elementary/config/default/meson.build b/data/elementary/config/default/meson.build
index 832e653269..9f8887131c 100644
--- a/data/elementary/config/default/meson.build
+++ b/data/elementary/config/default/meson.build
@@ -3,5 +3,5 @@ custom_target('config_'+config,
output: 'base.cfg',
command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
install: true,
- install_dir: join_paths(dir_data, 'elementary', 'config', config),
+ install_dir: dir_data / 'elementary/config' / config,
)
diff --git a/data/elementary/config/meson.build b/data/elementary/config/meson.build
index 12a81ef03f..dbc206d5c6 100644
--- a/data/elementary/config/meson.build
+++ b/data/elementary/config/meson.build
@@ -1,12 +1,12 @@
configs = ['default', 'mobile', 'standard']
foreach config : configs
- config_file = join_paths(meson.current_source_dir(), config, 'base.src.in')
- config_icon = join_paths(meson.current_source_dir(), config, 'icon.png')
- config_desktop = join_paths(meson.current_source_dir(), config, 'profile.desktop')
+ config_file = meson.current_source_dir() / config / 'base.src.in'
+ config_icon = meson.current_source_dir() / config / 'icon.png'
+ config_desktop = meson.current_source_dir() / config / 'profile.desktop'
install_data([config_icon, config_desktop],
- install_dir : join_paths(dir_data, 'elementary', 'config', config)
+ install_dir : dir_data / 'elementary/config' / config
)
subdir(config)
@@ -17,5 +17,5 @@ custom_target('config_profile',
output: 'profile.cfg',
command: [eet_bin, '-i', '@OUTPUT@', 'config', '@INPUT@', '0'],
install: true,
- install_dir: join_paths(dir_data, 'elementary', 'config'),
+ install_dir: dir_data / 'elementary/config',
)
diff --git a/data/elementary/config/mobile/meson.build b/data/elementary/config/mobile/meson.build
index 7705c69e29..7943f3b0ce 100644
--- a/data/elementary/config/mobile/meson.build
+++ b/data/elementary/config/mobile/meson.build
@@ -3,5 +3,5 @@
output: 'base.cfg',
command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
install: true,
- install_dir: join_paths(dir_data, 'elementary', 'config', config),
+ install_dir: dir_data / 'elementary/config' / config,
)
diff --git a/data/elementary/config/standard/meson.build b/data/elementary/config/standard/meson.build
index 7705c69e29..7943f3b0ce 100644
--- a/data/elementary/config/standard/meson.build
+++ b/data/elementary/config/standard/meson.build
@@ -3,5 +3,5 @@
output: 'base.cfg',
command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
install: true,
- install_dir: join_paths(dir_data, 'elementary', 'config', config),
+ install_dir: dir_data / 'elementary/config' / config,
)
diff --git a/data/elementary/desktop/meson.build b/data/elementary/desktop/meson.build
index 87a72eece6..63c2fc4b94 100644
--- a/data/elementary/desktop/meson.build
+++ b/data/elementary/desktop/meson.build
@@ -5,9 +5,9 @@ desktop_files = files(
elementary_icon = files('elementary.png')
install_data(desktop_files,
- install_dir : join_paths(dir_data, 'applications')
+ install_dir : dir_data / 'applications'
)
install_data(elementary_icon,
- install_dir : join_paths(dir_data, 'icons', 'hicolor', '128x128', 'apps')
+ install_dir : dir_data / 'icons/hicolor/128x128/apps'
)
diff --git a/data/elementary/edje_externals/meson.build b/data/elementary/edje_externals/meson.build
index 64fa05cdca..62818becb8 100644
--- a/data/elementary/edje_externals/meson.build
+++ b/data/elementary/edje_externals/meson.build
@@ -2,10 +2,10 @@ custom_target('edje_cc_edje_externals',
input : 'icons.edc',
output : '@BASENAME@.edj',
command : edje_cc_exe + [ '-beta', '-fastcomp',
- '-id', join_paths(meson.current_source_dir()),
+ '-id', meson.current_source_dir(),
'-id', elm_themes_image_include,
'@INPUT@', '@OUTPUT@'],
depends : edje_depends,
install : true,
- install_dir : join_paths(dir_data, 'elementary', 'edje_externals'),
+ install_dir : dir_data / 'elementary/edje_externals',
)
diff --git a/data/elementary/meson.build b/data/elementary/meson.build
index d6eb7a3420..0659108860 100644
--- a/data/elementary/meson.build
+++ b/data/elementary/meson.build
@@ -6,6 +6,6 @@ subdir('objects')
subdir('edje_externals')
install_subdir('images',
- install_dir : join_paths(dir_data, 'elementary'),
+ install_dir : dir_data / 'elementary',
exclude_files : ['Makefile.am']
)
diff --git a/data/elementary/objects/meson.build b/data/elementary/objects/meson.build
index 736e6a154d..dd67529ddc 100644
--- a/data/elementary/objects/meson.build
+++ b/data/elementary/objects/meson.build
@@ -24,12 +24,12 @@ foreach edc_file : edc_files
'-no-warn-unused-images',
'-sd', elm_themes_sound_include,
'-id', elm_themes_image_include,
- '-id', join_paths(meson.current_source_dir()),
- '-fd', join_paths(meson.current_source_dir()),
+ '-id', meson.current_source_dir(),
+ '-fd', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
depends : edje_depends,
install : true,
- install_dir : join_paths(dir_data, 'elementary', 'objects'),
+ install_dir : dir_data / 'elementary/objects',
)
endforeach
@@ -39,5 +39,5 @@ custom_target('prefs_compile',
command : elm_prefs_cc_exe + ['@INPUT@', '@OUTPUT@'],
depends : elm_prefs_cc,
install : true,
- install_dir : join_paths(dir_data, 'elementary', 'objects'),
+ install_dir : dir_data / 'elementary/objects',
)
diff --git a/data/elementary/themes/meson.build b/data/elementary/themes/meson.build
index cd007b2275..7fd85b3898 100644
--- a/data/elementary/themes/meson.build
+++ b/data/elementary/themes/meson.build
@@ -4,8 +4,8 @@ edc_files = [
elm_themes = []
-elm_themes_image_include = join_paths(meson.current_source_dir(), 'img')
-elm_themes_sound_include = join_paths(meson.current_source_dir(), 'snd')
+elm_themes_image_include = meson.current_source_dir() / 'img'
+elm_themes_sound_include = meson.current_source_dir() / 'snd'
foreach edc_file : edc_files
elm_themes += custom_target('edje_cc_' + edc_file,
@@ -14,28 +14,28 @@ foreach edc_file : edc_files
output : '@BASENAME@.edj',
command : edje_cc_exe + [ '-beta', '-fastdecomp',
'-deps', '@DEPFILE@',
- '-sd', join_paths(meson.current_source_dir(), 'snd'),
+ '-sd', meson.current_source_dir() / 'snd',
'-id', elm_themes_image_include,
- '-id', join_paths(meson.current_source_dir(), 'fdo'),
- '-fd', join_paths(meson.current_source_dir(), 'fnt'),
+ '-id', meson.current_source_dir() / 'fdo',
+ '-fd', meson.current_source_dir() / 'fnt',
'@INPUT@', '@OUTPUT@'],
depends : edje_depends,
install : true,
- install_dir : join_paths(dir_data, 'elementary', 'themes'),
+ install_dir : dir_data / 'elementary/themes',
)
endforeach
install_subdir('fdo',
- install_dir : join_paths(dir_data, 'icons', 'Enlightenment-X'),
+ install_dir : dir_data / 'icons/Enlightenment-X',
strip_directory : true,
exclude_directories : [
- join_paths('status', '128-svg'),
- join_paths('places', '16-svg'),
- join_paths('places', '128-svg'),
- join_paths('emblems', '96-svg'),
- join_paths('devices', '128-svg'),
- join_paths('categories', '128-svg'),
- join_paths('actions', '128-svg'),
+ 'status/128-svg',
+ 'places/16-svg',
+ 'places/128-svg',
+ 'emblems/96-svg',
+ 'devices/128-svg',
+ 'categories/128-svg',
+ 'actions/128-svg',
]
)
-elementary_img_data = join_paths(meson.current_source_dir())
+elementary_img_data = meson.current_source_dir()
diff --git a/data/embryo/meson.build b/data/embryo/meson.build
index d1f049e467..ae4786f31a 100644
--- a/data/embryo/meson.build
+++ b/data/embryo/meson.build
@@ -1,3 +1,3 @@
install_data('default.inc',
- install_dir : join_paths(dir_data, 'embryo', 'include')
+ install_dir : dir_data / 'embryo/include'
)
diff --git a/data/eo/meson.build b/data/eo/meson.build
index d7bac57695..e122c132a1 100644
--- a/data/eo/meson.build
+++ b/data/eo/meson.build
@@ -1,5 +1,5 @@
install_data('eo_gdb.py',
- install_dir : join_paths(dir_data, 'eo', 'gdb')
+ install_dir : dir_data / 'eo/gdb'
)
configuration = configuration_data()
@@ -9,5 +9,5 @@ configure_file(
input: 'libeo-gdb.py.in',
output: 'libeo.so.'+meson.project_version()+'-gdb.py',
configuration: configuration,
- install_dir: join_paths(dir_data, 'gdb', 'auto-load', 'usr', 'lib')
+ install_dir: dir_data / 'gdb/auto-load/usr/lib'
)
diff --git a/data/ethumb/frames/meson.build b/data/ethumb/frames/meson.build
index f10f982eee..30ad15c6df 100644
--- a/data/ethumb/frames/meson.build
+++ b/data/ethumb/frames/meson.build
@@ -4,11 +4,11 @@ custom_target('edje_cc_ethumb_frame',
input : ethumb_frame,
output : '@BASENAME@.edj',
command : edje_cc_exe + [ '-beta', '-fastcomp',
- '-sd', join_paths(meson.current_source_dir()),
- '-id', join_paths(meson.current_source_dir()),
- '-fd', join_paths(meson.current_source_dir()),
+ '-sd', meson.current_source_dir(),
+ '-id', meson.current_source_dir(),
+ '-fd', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
depends : edje_depends,
install : true,
- install_dir : join_paths(dir_data, 'ethumb', 'frames'),
+ install_dir : dir_data / 'ethumb/frames',
)
diff --git a/data/evas/meson.build b/data/evas/meson.build
index ddcc57dcad..8174427be5 100644
--- a/data/evas/meson.build
+++ b/data/evas/meson.build
@@ -1,4 +1,4 @@
install_data(files('evas.xml'),
- install_dir : join_paths(dir_data, 'mime', 'packages')
+ install_dir : dir_data / 'mime/packages'
)
diff --git a/data/meson.build b/data/meson.build
index 1583aeca6f..2f2460903e 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,13 +1,13 @@
checkme_files = ['ecore', 'ecore_imf', 'ecore_x', 'eeze', 'efreet', 'elua', 'emotion', 'ethumb', 'ethumb_client', 'evas']
foreach checkme : checkme_files
- install_data(join_paths(checkme, 'checkme'),
- install_dir : join_paths(dir_data, checkme)
+ install_data(checkme / 'checkme',
+ install_dir : dir_data / checkme
)
endforeach
subdir('eo')
subdir('edje')
subdir('embryo')
-subdir(join_paths('ethumb', 'frames'))
+subdir('ethumb/frames')
subdir('elementary')
subdir('evas')
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
