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 5ddc32f2e0fd8415dbf190911d06d70b2b1261ff
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 7 12:52:02 2024 +0500
meson: join_path - clean src/bin
---
src/bin/ecore_buffer/meson.build | 2 +-
src/bin/ecore_con/meson.build | 2 +-
src/bin/edje/epp/meson.build | 2 +-
src/bin/eeze/meson.build | 6 +++---
src/bin/efreet/meson.build | 6 +++---
src/bin/elementary/meson.build | 12 ++++++------
src/bin/ethumb_client/meson.build | 2 +-
src/bin/exactness/meson.build | 14 +++++++-------
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/bin/ecore_buffer/meson.build b/src/bin/ecore_buffer/meson.build
index b2df51b4f7..40fd40369f 100644
--- a/src/bin/ecore_buffer/meson.build
+++ b/src/bin/ecore_buffer/meson.build
@@ -2,5 +2,5 @@ executable('bqmgr',
['bq_mgr_protocol.c', 'bq_mgr.c'],
dependencies: [ecore, ecore_buffer, ecore_buffer_deps, ecore_buffer_ext_deps],
install: true,
- install_dir: join_paths(dir_lib, 'ecore_buffer', 'bin')
+ install_dir: dir_lib / 'ecore_buffer/bin'
)
diff --git a/src/bin/ecore_con/meson.build b/src/bin/ecore_con/meson.build
index d8d33dcd4d..26efe95dfa 100644
--- a/src/bin/ecore_con/meson.build
+++ b/src/bin/ecore_con/meson.build
@@ -2,5 +2,5 @@ executable('efl_net_proxy_helper',
'efl_net_proxy_helper.c',
dependencies : [ecore_con],
install : true,
- install_dir : join_paths(dir_lib, 'ecore_con', 'utils', version_name)
+ install_dir : dir_lib / 'ecore_con/utils' / version_name
)
diff --git a/src/bin/edje/epp/meson.build b/src/bin/edje/epp/meson.build
index bbe7e99a6d..1d34b57b96 100644
--- a/src/bin/edje/epp/meson.build
+++ b/src/bin/edje/epp/meson.build
@@ -13,7 +13,7 @@ epp = executable('epp',
epp_src,
dependencies: eolian,
install: true,
- install_dir : join_paths(dir_lib, 'edje', 'utils', version_name),
+ install_dir : dir_lib / 'edje/utils' / version_name,
c_args : [
package_c_args,
'-DHAVE_CONFIG_H',
diff --git a/src/bin/eeze/meson.build b/src/bin/eeze/meson.build
index 2bb4370bdd..5cfc1cd71b 100644
--- a/src/bin/eeze/meson.build
+++ b/src/bin/eeze/meson.build
@@ -1,10 +1,10 @@
eeze_bins = ['disk_ls', 'mount', 'scanner', 'scanner_monitor', 'umount']
foreach eeze_bin : eeze_bins
- src_file = join_paths('eeze_'+eeze_bin, 'eeze_'+eeze_bin+'.c')
- tmp = executable('eeze_'+eeze_bin, src_file,
+ src_file = 'eeze_' + eeze_bin / 'eeze_' + eeze_bin + '.c'
+ tmp = executable('eeze_' + eeze_bin, src_file,
dependencies: [ecore, eeze, ecore_con, ecore_file, eet],
install: true,
)
- set_variable('eeze_'+eeze_bin, tmp)
+ set_variable('eeze_' + eeze_bin, tmp)
endforeach
diff --git a/src/bin/efreet/meson.build b/src/bin/efreet/meson.build
index baf945d5de..17df6d1519 100644
--- a/src/bin/efreet/meson.build
+++ b/src/bin/efreet/meson.build
@@ -23,7 +23,7 @@ efreet_desktop_cache_create = executable('efreet_desktop_cache_create',
'efreet_desktop_cache_create.c',
dependencies: efreet_bin_deps,
install: true,
- install_dir : join_paths(dir_lib, 'efreet', version_name),
+ install_dir : dir_lib / 'efreet' / version_name,
c_args : package_c_args,
)
@@ -31,7 +31,7 @@ efreet_icon_cache_create = executable('efreet_icon_cache_create',
'efreet_icon_cache_create.c',
dependencies: efreet_bin_deps,
install: true,
- install_dir : join_paths(dir_lib, 'efreet', version_name),
+ install_dir : dir_lib / 'efreet' / version_name,
c_args : package_c_args,
)
@@ -39,6 +39,6 @@ efreet_mime_cache_create = executable('efreet_mime_cache_create',
'efreet_mime_cache_create.c',
dependencies: efreet_bin_deps,
install: true,
- install_dir : join_paths(dir_lib, 'efreet', version_name),
+ install_dir : dir_lib / 'efreet' / version_name,
c_args : package_c_args,
)
diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build
index 5254eb69ba..d9422c297f 100644
--- a/src/bin/elementary/meson.build
+++ b/src/bin/elementary/meson.build
@@ -180,9 +180,9 @@ elementary_test = executable('elementary_test',
dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps,
install: true,
c_args : package_c_args + [
- '-Delementary_test_BIN_DIR="'+dir_bin+'"',
- '-Delementary_test_LIB_DIR="'+dir_lib+'"',
- '-Delementary_test_DATA_DIR="'+join_paths(dir_data,'elementary')+'"'
+ '-Delementary_test_BIN_DIR="' + dir_bin + '"',
+ '-Delementary_test_LIB_DIR="' + dir_lib + '"',
+ '-Delementary_test_DATA_DIR="' + dir_data / 'elementary' + '"'
],
link_args: link_args
)
@@ -291,9 +291,9 @@ elementary_perf = executable('elementary_perf',
dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps,
install: true,
c_args : package_c_args + [
- '-Delementary_test_BIN_DIR="'+dir_bin+'"',
- '-Delementary_test_LIB_DIR="'+dir_lib+'"',
- '-Delementary_test_DATA_DIR="'+join_paths(dir_data,'elementary')+'"'
+ '-Delementary_test_BIN_DIR="' + dir_bin + '"',
+ '-Delementary_test_LIB_DIR="' + dir_lib + '"',
+ '-Delementary_test_DATA_DIR="' + dir_data / 'elementary' + '"'
],
link_args: link_args
)
diff --git a/src/bin/ethumb_client/meson.build b/src/bin/ethumb_client/meson.build
index 243e5699af..663e5ec821 100644
--- a/src/bin/ethumb_client/meson.build
+++ b/src/bin/ethumb_client/meson.build
@@ -17,7 +17,7 @@ ethumbd_client = executable('ethumbd_client',
ethumbd_slave = executable('ethumbd_slave',
'ethumbd_slave.c',
install: true,
- install_dir : join_paths(dir_lib, 'ethumb_client', 'utils', version_name),
+ install_dir : dir_lib / 'ethumb_client/utils' / version_name,
dependencies : [ecore, ethumb, ethumb_client, ecore],
include_directories : config_dir,
c_args : package_c_args,
diff --git a/src/bin/exactness/meson.build b/src/bin/exactness/meson.build
index 4d048f18c9..975ea3c5dc 100644
--- a/src/bin/exactness/meson.build
+++ b/src/bin/exactness/meson.build
@@ -1,21 +1,21 @@
exactness_bin = executable('exactness',
[ 'exactness.c', 'common.c', 'common.h' ],
dependencies: [ ecore, ecore_evas, ecore_file, elementary],
- c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"',
+ c_args: '-DDATA_DIR="' + dir_data / 'exactness' + '"',
install: true,
)
exactness_inject_bin = executable('exactness_inject',
[ 'injector.c', 'common.c', 'common.h' ],
dependencies: [ elementary ],
- c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"',
+ c_args: '-DDATA_DIR="' + dir_data / 'exactness' + '"',
install: true,
)
exactness_inspect_bin = executable('exactness_inspect',
[ 'inspect.c', 'common.c', 'common.h' ],
dependencies: [ elementary ],
- c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"',
+ c_args: '-DDATA_DIR="' + dir_data / 'exactness' + '"',
install: true,
)
@@ -25,15 +25,15 @@ edjs = custom_target('player_entry',
install : true,
install_dir : 'share/exactness',
command : edje_cc_exe + [
- '-id', join_paths(meson.source_root(), 'data', 'elementary', 'themes', 'img'),
- '-sd', join_paths(meson.source_root(), 'data', 'elementary', 'themes', 'snd'),
+ '-id', meson.source_root() / 'data/elementary/themes/img',
+ '-sd', meson.source_root() / 'data/elementary/themes/snd',
'@INPUT@', '@OUTPUT@'],
depends : edje_depends)
exactness_play_bin = library('exactness_play',
[ 'player.c', 'common.c', 'common.h', edjs ],
dependencies: [ elementary, dl],
- c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"',
+ c_args: '-DDATA_DIR="' + dir_data / 'exactness' + '"',
install: true,
version : meson.project_version()
)
@@ -41,7 +41,7 @@ exactness_play_bin = library('exactness_play',
exactness_record_bin = library('exactness_record',
[ 'recorder.c', 'common.c', 'common.h' ],
dependencies: [ elementary, dl],
- c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"',
+ c_args: '-DDATA_DIR="' + dir_data / 'exactness' + '"',
install: true,
version : meson.project_version()
)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
