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 a37e955febb73ef84d61e5a5fdedc11872d9c876
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 7 14:02:41 2024 +0500
meson: join_path - clean src/modules
---
src/modules/ecore/meson.build | 4 +--
src/modules/ecore/system/systemd/meson.build | 2 +-
src/modules/ecore/system/tizen/meson.build | 2 +-
src/modules/ecore/system/upower/meson.build | 2 +-
src/modules/ecore_buffer/shm/meson.build | 2 +-
src/modules/ecore_buffer/x11_dri2/meson.build | 2 +-
src/modules/ecore_buffer/x11_dri3/meson.build | 2 +-
src/modules/ecore_evas/engines/cocoa/meson.build | 2 +-
src/modules/ecore_evas/engines/drm/meson.build | 2 +-
src/modules/ecore_evas/engines/fb/meson.build | 2 +-
src/modules/ecore_evas/engines/wayland/meson.build | 2 +-
src/modules/ecore_evas/meson.build | 10 +++----
src/modules/ecore_evas/vnc_server/meson.build | 2 +-
src/modules/ecore_imf/meson.build | 4 +--
src/modules/ecore_wl2/meson.build | 6 ++--
src/modules/eeze/meson.build | 2 +-
src/modules/eeze/sensor/fake/meson.build | 4 +--
src/modules/eeze/sensor/udev/meson.build | 4 +--
src/modules/eina/meson.build | 6 ++--
src/modules/elementary/meson.build | 6 ++--
src/modules/emotion/meson.build | 4 +--
src/modules/ethumb/meson.build | 4 +--
src/modules/evas/engines/buffer/meson.build | 4 +--
src/modules/evas/engines/drm/meson.build | 2 +-
src/modules/evas/engines/fb/meson.build | 2 +-
src/modules/evas/engines/gl_cocoa/meson.build | 2 +-
src/modules/evas/engines/gl_drm/meson.build | 2 +-
src/modules/evas/engines/gl_generic/meson.build | 35 +++++++++++-----------
src/modules/evas/engines/gl_x11/meson.build | 2 +-
src/modules/evas/engines/meson.build | 4 +--
.../evas/engines/software_ddraw/meson.build | 2 +-
src/modules/evas/engines/software_gdi/meson.build | 2 +-
src/modules/evas/engines/software_x11/meson.build | 2 +-
src/modules/evas/engines/wayland_egl/meson.build | 4 +--
src/modules/evas/engines/wayland_shm/meson.build | 4 +--
src/modules/evas/image_loaders/meson.build | 8 ++---
src/modules/evas/image_savers/meson.build | 8 ++---
37 files changed, 80 insertions(+), 79 deletions(-)
diff --git a/src/modules/ecore/meson.build b/src/modules/ecore/meson.build
index a34c236ce1..d0439b6533 100644
--- a/src/modules/ecore/meson.build
+++ b/src/modules/ecore/meson.build
@@ -8,8 +8,8 @@ if sys_windows == false and sys_osx == false
]
foreach system_module : system_modules
- mod_install_dir = join_paths(dir_lib, 'ecore', 'system', system_module, version_name)
- subdir(join_paths('system', system_module))
+ mod_install_dir = dir_lib / 'ecore/system' / system_module / version_name
+ subdir('system' / system_module)
endforeach
endif
diff --git a/src/modules/ecore/system/systemd/meson.build b/src/modules/ecore/system/systemd/meson.build
index 2a1104ca6a..cf8f7db2d0 100644
--- a/src/modules/ecore/system/systemd/meson.build
+++ b/src/modules/ecore/system/systemd/meson.build
@@ -6,5 +6,5 @@ if get_option('systemd')
install_dir: mod_install_dir,
name_suffix : sys_mod_extension
)
- module_files += join_paths(mod_install_dir, 'libsystemd.' + sys_mod_extension)
+ module_files += mod_install_dir / 'libsystemd.' + sys_mod_extension
endif
diff --git a/src/modules/ecore/system/tizen/meson.build b/src/modules/ecore/system/tizen/meson.build
index 8d9db22661..9f7826e1d8 100644
--- a/src/modules/ecore/system/tizen/meson.build
+++ b/src/modules/ecore/system/tizen/meson.build
@@ -5,4 +5,4 @@ ecore_systemd_mod = shared_module('tizen',
install_dir: mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'libtizen.' + sys_mod_extension)
+module_files += mod_install_dir / 'libtizen.' + sys_mod_extension
diff --git a/src/modules/ecore/system/upower/meson.build b/src/modules/ecore/system/upower/meson.build
index b579bed76d..94d30b329c 100644
--- a/src/modules/ecore/system/upower/meson.build
+++ b/src/modules/ecore/system/upower/meson.build
@@ -5,4 +5,4 @@ ecore_systemd_mod = shared_module('upower',
install_dir: mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'libupower.' + sys_mod_extension)
+module_files += mod_install_dir / 'libupower.' + sys_mod_extension
diff --git a/src/modules/ecore_buffer/shm/meson.build b/src/modules/ecore_buffer/shm/meson.build
index 80c0a796de..b214d6bcb3 100644
--- a/src/modules/ecore_buffer/shm/meson.build
+++ b/src/modules/ecore_buffer/shm/meson.build
@@ -3,6 +3,6 @@ ecore_buffer_shm_mod = shared_module('module',
name_prefix: '',
dependencies: [ecore, ecore_buffer],
install: true,
- install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'shm', version_name),
+ install_dir: dir_lib / 'ecore_buffer/modules/shm' / version_name,
name_suffix : sys_mod_extension
)
diff --git a/src/modules/ecore_buffer/x11_dri2/meson.build b/src/modules/ecore_buffer/x11_dri2/meson.build
index 34cca89916..b61b028183 100644
--- a/src/modules/ecore_buffer/x11_dri2/meson.build
+++ b/src/modules/ecore_buffer/x11_dri2/meson.build
@@ -3,6 +3,6 @@ ecore_buffer_x11_dri2_mod = shared_module('module',
name_prefix: '',
dependencies: [ecore, ecore_buffer, ecore_x],
install: true,
- install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri2', version_name),
+ install_dir: dir_lib / 'ecore_buffer/modules/x11_dri2' / version_name,
name_suffix : sys_mod_extension
)
diff --git a/src/modules/ecore_buffer/x11_dri3/meson.build b/src/modules/ecore_buffer/x11_dri3/meson.build
index ce89219b53..cc665f4404 100644
--- a/src/modules/ecore_buffer/x11_dri3/meson.build
+++ b/src/modules/ecore_buffer/x11_dri3/meson.build
@@ -4,7 +4,7 @@ if dependency('libtbm', required: false).found() == true and dependency('libdrm'
name_prefix: '',
dependencies: [ecore, ecore_buffer, ecore_x],
install: true,
- install_dir: join_paths(dir_lib, 'ecore_buffer', 'modules', 'x11_dri3', version_name),
+ install_dir: dir_lib / 'ecore_buffer/modules/x11_dri3' / version_name,
name_suffix : sys_mod_extension
)
endif
diff --git a/src/modules/ecore_evas/engines/cocoa/meson.build b/src/modules/ecore_evas/engines/cocoa/meson.build
index 63a904e36c..b2f475bc78 100644
--- a/src/modules/ecore_evas/engines/cocoa/meson.build
+++ b/src/modules/ecore_evas/engines/cocoa/meson.build
@@ -5,7 +5,7 @@ endif
engine_src = files(['ecore_evas_cocoa.c'])
engine_deps = [ecore_cocoa, ecore_input, ecore_input_evas, ecore]
-engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'gl_cocoa'))
+engine_include_dir += include_directories('../../../evas/engines/gl_cocoa')
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
diff --git a/src/modules/ecore_evas/engines/drm/meson.build b/src/modules/ecore_evas/engines/drm/meson.build
index 58071010d0..4ad36ba0c3 100644
--- a/src/modules/ecore_evas/engines/drm/meson.build
+++ b/src/modules/ecore_evas/engines/drm/meson.build
@@ -6,7 +6,7 @@ if get_option('opengl') != 'none'
engine_deps += [engine_gl_drm]
endif
-engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm'))
+engine_include_dir += include_directories('../../../evas/engines/drm')
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
diff --git a/src/modules/ecore_evas/engines/fb/meson.build b/src/modules/ecore_evas/engines/fb/meson.build
index 7da2c22612..bb50b636fb 100644
--- a/src/modules/ecore_evas/engines/fb/meson.build
+++ b/src/modules/ecore_evas/engines/fb/meson.build
@@ -1,6 +1,6 @@
engine_src = files(['ecore_evas_fb.c'])
engine_deps = [ecore_fb, ecore_input]
-engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'fb'))
+engine_include_dir += include_directories('../../../evas/engines/fb')
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
diff --git a/src/modules/ecore_evas/engines/wayland/meson.build b/src/modules/ecore_evas/engines/wayland/meson.build
index 259d8bcdd8..29a4e1149f 100644
--- a/src/modules/ecore_evas/engines/wayland/meson.build
+++ b/src/modules/ecore_evas/engines/wayland/meson.build
@@ -12,7 +12,7 @@ engine_src = files([
])
engine_deps = [ecore_wl2, ecore_input] + ecore_wl2_ext_deps
-engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'wayland_common'))
+engine_include_dir += include_directories('../../../evas/engines/wayland_common')
shared_module(mod_full_name, engine_src,
diff --git a/src/modules/ecore_evas/meson.build b/src/modules/ecore_evas/meson.build
index 7a9d6979da..98849a203f 100644
--- a/src/modules/ecore_evas/meson.build
+++ b/src/modules/ecore_evas/meson.build
@@ -30,17 +30,17 @@ foreach engine_conf : engines
config_h.set('BUILD_ECORE_EVAS_'+engine.to_upper(), '1')
mod_full_name = engine
- mod_install_dir = join_paths(dir_lib, package_name, 'engines', engine, version_name)
+ mod_install_dir = dir_lib / package_name / 'engines' / engine / version_name
- subdir(join_paths('engines', engine))
+ subdir('engines' / engine)
- module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+ module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
endif
endforeach
if get_option('vnc-server')
- mod_install_dir = join_paths(dir_lib, package_name, engine, version_name)
+ mod_install_dir = dir_lib / package_name / engine / version_name
- subdir(join_paths('vnc_server'))
+ subdir('vnc_server')
endif
diff --git a/src/modules/ecore_evas/vnc_server/meson.build b/src/modules/ecore_evas/vnc_server/meson.build
index e458532097..1c03e6d649 100644
--- a/src/modules/ecore_evas/vnc_server/meson.build
+++ b/src/modules/ecore_evas/vnc_server/meson.build
@@ -10,7 +10,7 @@ engine_deps = [ecore, ecore_input, ecore_evas, evas]
engine_deps += dependency('libvncserver')
engine_available = false
-engine_include_dir += include_directories(join_paths('..', '..', '..', 'lib', 'ecore_fb'))
+engine_include_dir += include_directories('../../../lib/ecore_fb')
shared_module('vnc_server', engine_src,
include_directories : config_dir + [engine_include_dir],
diff --git a/src/modules/ecore_imf/meson.build b/src/modules/ecore_imf/meson.build
index 72ab44ff51..db300afb12 100644
--- a/src/modules/ecore_imf/meson.build
+++ b/src/modules/ecore_imf/meson.build
@@ -20,9 +20,9 @@ foreach mod_name : mods
error('Need glib enabled if ibus is enabled')
endif
endif
- mod_install_dir = join_paths(dir_package_modules, mod_name, version_name)
+ mod_install_dir = dir_package_modules / mod_name / version_name
subdir(mod_name)
- module_files += join_paths(mod_install_dir, 'lib'+mod_name+'.'+sys_mod_extension)
+ module_files += mod_install_dir / 'lib'+mod_name+'.'+sys_mod_extension
config_h.set('BUILD_ECORE_IMF_'+mod_name.to_upper(), '1')
endif
endforeach
diff --git a/src/modules/ecore_wl2/meson.build b/src/modules/ecore_wl2/meson.build
index 986391ab96..83ea2703d8 100644
--- a/src/modules/ecore_wl2/meson.build
+++ b/src/modules/ecore_wl2/meson.build
@@ -3,7 +3,7 @@ ecore_wl2_engines = [
]
foreach engine : ecore_wl2_engines
- mod_install_dir = join_paths(dir_lib, 'ecore_wl2', 'engines', engine, version_name)
- subdir(join_paths('engines', engine))
- module_files += join_paths(mod_install_dir, 'lib'+engine+'.'+sys_mod_extension)
+ mod_install_dir = dir_lib / 'ecore_wl2/engines' / engine / version_name
+ subdir('engines' / engine)
+ module_files += mod_install_dir / 'lib'+engine+'.'+sys_mod_extension
endforeach
diff --git a/src/modules/eeze/meson.build b/src/modules/eeze/meson.build
index 919ff206c3..8ca02aae4e 100644
--- a/src/modules/eeze/meson.build
+++ b/src/modules/eeze/meson.build
@@ -5,5 +5,5 @@ sensors = [
foreach sensor_conf : sensors
module_name = sensor_conf[0]
- subdir(join_paths('sensor', module_name))
+ subdir('sensor' / module_name)
endforeach
diff --git a/src/modules/eeze/sensor/fake/meson.build b/src/modules/eeze/sensor/fake/meson.build
index f2495423db..3372676019 100644
--- a/src/modules/eeze/sensor/fake/meson.build
+++ b/src/modules/eeze/sensor/fake/meson.build
@@ -2,8 +2,8 @@ shared_module(module_name,
module_name+'.c',
dependencies: [eina, eeze, ecore],
install: true,
- install_dir : join_paths(dir_package_modules, 'sensor', module_name, version_name),
+ install_dir : dir_package_modules / 'sensor' / module_name / version_name,
name_suffix : sys_mod_extension
)
-module_files += join_paths(dir_package_modules, 'sensor', module_name, version_name, 'lib' + module_name + '.' + sys_lib_extension)
+module_files += dir_package_modules / 'sensor' / module_name / version_name / 'lib' + module_name + '.' + sys_lib_extension
diff --git a/src/modules/eeze/sensor/udev/meson.build b/src/modules/eeze/sensor/udev/meson.build
index f2495423db..3372676019 100644
--- a/src/modules/eeze/sensor/udev/meson.build
+++ b/src/modules/eeze/sensor/udev/meson.build
@@ -2,8 +2,8 @@ shared_module(module_name,
module_name+'.c',
dependencies: [eina, eeze, ecore],
install: true,
- install_dir : join_paths(dir_package_modules, 'sensor', module_name, version_name),
+ install_dir : dir_package_modules / 'sensor' / module_name / version_name,
name_suffix : sys_mod_extension
)
-module_files += join_paths(dir_package_modules, 'sensor', module_name, version_name, 'lib' + module_name + '.' + sys_lib_extension)
+module_files += dir_package_modules / 'sensor' / module_name / version_name / 'lib' + module_name + '.' + sys_lib_extension
diff --git a/src/modules/eina/meson.build b/src/modules/eina/meson.build
index 17396a198c..73355ab774 100644
--- a/src/modules/eina/meson.build
+++ b/src/modules/eina/meson.build
@@ -1,8 +1,8 @@
eina_mp_sources = []
-subdir(join_paths('mp', 'chained_pool'))
-subdir(join_paths('mp', 'one_big'))
-subdir(join_paths('mp', 'pass_through'))
+subdir('mp/chained_pool')
+subdir('mp/one_big')
+subdir('mp/pass_through')
eina_mem_pools = declare_dependency(
sources: eina_mp_sources
diff --git a/src/modules/elementary/meson.build b/src/modules/elementary/meson.build
index 8be55960e5..fb6fe02cc2 100644
--- a/src/modules/elementary/meson.build
+++ b/src/modules/elementary/meson.build
@@ -3,11 +3,11 @@ mods = [
'prefs',
'test_entry',
'test_map',
- join_paths('web', 'none')
+ 'web/none'
]
foreach mod : mods
- mod_install_dir = join_paths(dir_lib, 'elementary', 'modules', mod, version_name)
+ mod_install_dir = dir_lib / 'elementary/modules' / mod / version_name
subdir(mod)
- module_files += join_paths(mod_install_dir, 'lib'+mod+'.'+sys_mod_extension)
+ module_files += mod_install_dir / 'lib'+mod+'.'+sys_mod_extension
endforeach
diff --git a/src/modules/emotion/meson.build b/src/modules/emotion/meson.build
index 595557b710..41c8830178 100644
--- a/src/modules/emotion/meson.build
+++ b/src/modules/emotion/meson.build
@@ -3,11 +3,11 @@ emotion_loaders = [ 'gstreamer1' ]
foreach emotion_loader : emotion_loaders
generic_src = []
generic_deps = []
- mod_install_dir = join_paths(dir_lib, 'emotion', 'modules', emotion_loader, version_name)
+ mod_install_dir = dir_lib / 'emotion/modules' / emotion_loader / version_name
if get_option('gstreamer') == true
subdir(emotion_loader)
- module_files += join_paths(mod_install_dir, 'lib'+emotion_loader+'.'+sys_mod_extension)
+ module_files += mod_install_dir / 'lib'+emotion_loader+'.'+sys_mod_extension
config_h.set('EMOTION_BUILD_'+emotion_loader.to_upper(), 1)
endif
endforeach
diff --git a/src/modules/ethumb/meson.build b/src/modules/ethumb/meson.build
index 015a182ee6..0265255b2e 100644
--- a/src/modules/ethumb/meson.build
+++ b/src/modules/ethumb/meson.build
@@ -5,9 +5,9 @@ emotion_loaders = [
foreach emotion_loader : emotion_loaders
generic_src = []
generic_deps = []
- mod_install_dir = join_paths(dir_lib, 'ethumb', 'modules', emotion_loader, version_name)
+ mod_install_dir = dir_lib / 'ethumb/modules' / emotion_loader / version_name
subdir(emotion_loader)
- module_files += join_paths(mod_install_dir, 'lib'+emotion_loader+'_el.'+sys_mod_extension)
+ module_files += mod_install_dir / 'lib'+emotion_loader+'_el.'+sys_mod_extension
endforeach
diff --git a/src/modules/evas/engines/buffer/meson.build b/src/modules/evas/engines/buffer/meson.build
index 4a6f31fe3a..74d4d40d9c 100644
--- a/src/modules/evas/engines/buffer/meson.build
+++ b/src/modules/evas/engines/buffer/meson.build
@@ -8,7 +8,7 @@ engine_src = files([
evas_include_directories += include_directories('.')
install_headers('Evas_Engine_Buffer.h',
- install_dir : join_paths(dir_include, 'evas-'+version_major),
+ install_dir : dir_include / 'evas-'+version_major,
)
engine_deps += [eet]
@@ -21,4 +21,4 @@ evas_engine_buffer_mod = shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/drm/meson.build b/src/modules/evas/engines/drm/meson.build
index a75732a1b1..1a0d00f150 100644
--- a/src/modules/evas/engines/drm/meson.build
+++ b/src/modules/evas/engines/drm/meson.build
@@ -14,4 +14,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/fb/meson.build b/src/modules/evas/engines/fb/meson.build
index 29f3b76dd5..cb1c116e1f 100644
--- a/src/modules/evas/engines/fb/meson.build
+++ b/src/modules/evas/engines/fb/meson.build
@@ -16,4 +16,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/gl_cocoa/meson.build b/src/modules/evas/engines/gl_cocoa/meson.build
index 2fc5bb9b2c..af7b030327 100644
--- a/src/modules/evas/engines/gl_cocoa/meson.build
+++ b/src/modules/evas/engines/gl_cocoa/meson.build
@@ -14,4 +14,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/gl_drm/meson.build b/src/modules/evas/engines/gl_drm/meson.build
index b21c00edb5..044849fe6a 100644
--- a/src/modules/evas/engines/gl_drm/meson.build
+++ b/src/modules/evas/engines/gl_drm/meson.build
@@ -14,4 +14,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/gl_generic/meson.build b/src/modules/evas/engines/gl_generic/meson.build
index 0464ea43a8..0c99a88405 100644
--- a/src/modules/evas/engines/gl_generic/meson.build
+++ b/src/modules/evas/engines/gl_generic/meson.build
@@ -1,20 +1,21 @@
-engine_src = files([
+engine_src = files(
'evas_engine.c',
'Evas_Engine_GL_Generic.h',
'Evas_Engine_GL_Shared.h',
'evas_ector_gl.h',
'evas_ector_gl_buffer.c',
'evas_ector_gl_image_buffer.c',
- join_paths('filters','gl_engine_filter.h'),
- join_paths('filters','gl_filter_blend.c'),
- join_paths('filters','gl_filter_blur.c'),
- join_paths('filters','gl_filter_curve.c'),
- join_paths('filters','gl_filter_displace.c'),
- join_paths('filters','gl_filter_fill.c'),
- join_paths('filters','gl_filter_mask.c'),
- join_paths('filters','gl_filter_grayscale.c'),
- join_paths('filters','gl_filter_inverse_color.c'),
-])
+ 'filters/gl_engine_filter.h',
+ 'filters/gl_filter_blend.c',
+ 'filters/gl_filter_blur.c',
+ 'filters/gl_filter_curve.c',
+ 'filters/gl_filter_displace.c',
+ 'filters/gl_filter_fill.c',
+ 'filters/gl_filter_mask.c',
+ 'filters/gl_filter_grayscale.c',
+ 'filters/gl_filter_inverse_color.c',
+)
+
common_engine_src = [
'evas_gl_private.h',
'evas_gl_common.h',
@@ -42,7 +43,7 @@ common_engine_src = [
]
foreach src : common_engine_src
- engine_src += files(join_paths('..','gl_common', src))
+ engine_src += files('../gl_common' / src)
endforeach
pub_eo_files = [
@@ -56,16 +57,16 @@ foreach eo_file : pub_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EMODAPI',
'-gchd', '@INPUT@'])
endforeach
engine_deps += [gl_deps]
-engine_include_dir = include_directories(join_paths('..','software_generic'), join_paths('..', 'gl_common'))
+engine_include_dir = include_directories('../software_generic', '../gl_common')
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
@@ -74,4 +75,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/gl_x11/meson.build b/src/modules/evas/engines/gl_x11/meson.build
index fd39ba29e8..22f85e33c3 100644
--- a/src/modules/evas/engines/gl_x11/meson.build
+++ b/src/modules/evas/engines/gl_x11/meson.build
@@ -14,4 +14,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build
index b1c11369c9..a316e45a54 100644
--- a/src/modules/evas/engines/meson.build
+++ b/src/modules/evas/engines/meson.build
@@ -57,8 +57,8 @@ foreach engine_conf : engines
mod_full_name = engine
# root meson.build declares the root evas engines project as `evas/engines`,
# but modules must be installed in evas/modules
- evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
- mod_install_dir = join_paths(evas_package_modules, 'engines', engine, version_name)
+ evas_package_modules = dir_lib / 'evas/modules'
+ mod_install_dir = evas_package_modules / 'engines' / engine / version_name
subdir(engine)
diff --git a/src/modules/evas/engines/software_ddraw/meson.build b/src/modules/evas/engines/software_ddraw/meson.build
index b15acfd3ad..ee9e0e3fc1 100644
--- a/src/modules/evas/engines/software_ddraw/meson.build
+++ b/src/modules/evas/engines/software_ddraw/meson.build
@@ -16,4 +16,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/software_gdi/meson.build b/src/modules/evas/engines/software_gdi/meson.build
index 549094913f..8ffc2aa354 100644
--- a/src/modules/evas/engines/software_gdi/meson.build
+++ b/src/modules/evas/engines/software_gdi/meson.build
@@ -15,4 +15,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/software_x11/meson.build b/src/modules/evas/engines/software_x11/meson.build
index 4c498f7adc..236fead456 100644
--- a/src/modules/evas/engines/software_x11/meson.build
+++ b/src/modules/evas/engines/software_x11/meson.build
@@ -30,4 +30,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/wayland_egl/meson.build b/src/modules/evas/engines/wayland_egl/meson.build
index caeab5e0e3..9e7158c5ea 100644
--- a/src/modules/evas/engines/wayland_egl/meson.build
+++ b/src/modules/evas/engines/wayland_egl/meson.build
@@ -6,7 +6,7 @@ engine_src = files([
engine_deps += [ecore_wl2, dependency('wayland-egl'), gl_deps]
-engine_include_dir = include_directories(join_paths('..','wayland_common'))
+engine_include_dir = include_directories('../wayland_common')
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
@@ -15,4 +15,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/engines/wayland_shm/meson.build b/src/modules/evas/engines/wayland_shm/meson.build
index c5bbd6062c..545530d631 100644
--- a/src/modules/evas/engines/wayland_shm/meson.build
+++ b/src/modules/evas/engines/wayland_shm/meson.build
@@ -6,7 +6,7 @@ engine_src = files([
engine_deps += [ecore_wl2]
-engine_include_dir = include_directories(join_paths('..','wayland_common'))
+engine_include_dir = include_directories('../wayland_common')
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
@@ -15,4 +15,4 @@ shared_module(mod_full_name, engine_src,
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
-module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
+module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
diff --git a/src/modules/evas/image_loaders/meson.build b/src/modules/evas/image_loaders/meson.build
index 11b11f79c2..0942613732 100644
--- a/src/modules/evas/image_loaders/meson.build
+++ b/src/modules/evas/image_loaders/meson.build
@@ -5,9 +5,9 @@ foreach loader_inst : evas_image_loaders_file
if get_option('evas-loaders-disabler').contains(loader) == false
if loader_type == 'shared'
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
- evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
- mod_install_dir = join_paths(evas_package_modules, 'image_loaders', loader, version_name)
+ file = meson.source_root() / 'src/modules/evas/image_loaders' / loader / 'evas_image_load_'+loader+'.c'
+ evas_package_modules = dir_lib / 'evas/modules'
+ mod_install_dir = evas_package_modules / 'image_loaders' / loader / version_name
shared_module('shared_loader_'+loader, file,
c_args : package_c_args,
include_directories : config_dir,
@@ -16,7 +16,7 @@ foreach loader_inst : evas_image_loaders_file
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
- module_files += join_paths(mod_install_dir, 'libshared_loader_'+loader + '.' + sys_mod_extension)
+ module_files += mod_install_dir / 'libshared_loader_'+loader + '.' + sys_mod_extension
endif
else
message('Image loader '+loader+' disabled')
diff --git a/src/modules/evas/image_savers/meson.build b/src/modules/evas/image_savers/meson.build
index e30a05fe3b..a0b7168ab4 100644
--- a/src/modules/evas/image_savers/meson.build
+++ b/src/modules/evas/image_savers/meson.build
@@ -5,9 +5,9 @@ foreach loader_inst : evas_image_savers_file
if get_option('evas-loaders-disabler').contains(loader) == false
if loader_type == 'shared'
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
- evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
- mod_install_dir = join_paths(evas_package_modules, 'image_savers', loader, version_name)
+ file = meson.source_root() / 'src/modules/evas/image_savers' / loader / 'evas_image_save_'+loader+'.c'
+ evas_package_modules = dir_lib / 'evas/modules'
+ mod_install_dir = evas_package_modules / 'image_savers' / loader / version_name
shared_module('shared_saver_'+loader, file,
c_args : package_c_args,
include_directories : config_dir,
@@ -16,7 +16,7 @@ foreach loader_inst : evas_image_savers_file
install_dir : mod_install_dir,
name_suffix : sys_mod_extension
)
- module_files += join_paths(mod_install_dir, 'libshared_saver_'+loader + '.' + sys_mod_extension)
+ module_files += mod_install_dir / 'libshared_saver_'+loader + '.' + sys_mod_extension
endif
else
message('Image saver '+loader+' disabled')
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
