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 140f6b700cbc03f5735763f3ec89ed87667dea12
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 7 13:10:47 2024 +0500
meson: join_path - clean src/bindings
---
src/bindings/cxx/efl_cxx/meson.build | 6 +++---
src/bindings/cxx/elementary_cxx/meson.build | 2 +-
src/bindings/cxx/eolian_cxx/meson.build | 8 ++++----
src/bindings/cxx/meson.build | 32 ++++++++++++++---------------
src/bindings/lua/meson.build | 4 ++--
src/bindings/meson.build | 6 +++---
src/bindings/mono/efl_mono/meson.build | 22 ++++++++++----------
src/bindings/mono/eolian_mono/meson.build | 4 ++--
src/bindings/mono/meson.build | 20 +++++++++---------
9 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/src/bindings/cxx/efl_cxx/meson.build b/src/bindings/cxx/efl_cxx/meson.build
index 0dca3250c9..671e244bd6 100644
--- a/src/bindings/cxx/efl_cxx/meson.build
+++ b/src/bindings/cxx/efl_cxx/meson.build
@@ -1,5 +1,5 @@
-cxx_header_src += join_paths(file_location, 'Efl.hh')
+cxx_header_src += file_location / 'Efl.hh'
-install_headers(join_paths('..', file_location, 'cxx', 'efl_part_impl.hh'),
- subdir: join_paths(package_version_name, 'cxx')
+install_headers('..' / file_location / 'cxx/efl_part_impl.hh',
+ subdir: package_version_name / 'cxx'
)
diff --git a/src/bindings/cxx/elementary_cxx/meson.build b/src/bindings/cxx/elementary_cxx/meson.build
index 3c76dade79..864f1d7cd5 100644
--- a/src/bindings/cxx/elementary_cxx/meson.build
+++ b/src/bindings/cxx/elementary_cxx/meson.build
@@ -1 +1 @@
-cxx_header_src += files(join_paths('..', file_location, 'Efl_Ui.hh'))
+cxx_header_src += files('..' / file_location / 'Efl_Ui.hh')
diff --git a/src/bindings/cxx/eolian_cxx/meson.build b/src/bindings/cxx/eolian_cxx/meson.build
index 43590d3f9f..d27ddd2ce0 100644
--- a/src/bindings/cxx/eolian_cxx/meson.build
+++ b/src/bindings/cxx/eolian_cxx/meson.build
@@ -54,17 +54,17 @@ name_grammer_eolian_cxx_header_src= [
cxx_header_src = []
foreach header : name_eolian_cxx_header_src
- cxx_header_src += files(join_paths('..', '..', '..', 'lib', 'eolian_cxx', header))
+ cxx_header_src += files('../../../lib/eolian_cxx' / header)
endforeach
foreach header : name_grammer_eolian_cxx_header_src
- cxx_header_src += files(join_paths('..', '..', '..', 'lib', 'eolian_cxx', 'grammar', header))
+ cxx_header_src += files('../../../lib/eolian_cxx/grammar' / header)
endforeach
-inc_dir = include_directories(join_paths('..', '..', '..', 'lib', 'eolian_cxx'))
+inc_dir = include_directories('../../../lib/eolian_cxx')
eolian_cxx_gen_bin = executable('eolian_cxx',
- join_paths('..', '..', '..', 'bin', 'eolian_cxx', 'eolian_cxx.cc'),
+ '../../../bin/eolian_cxx/eolian_cxx.cc',
dependencies: [eina_cxx, eolian],
install: true,
include_directories : inc_dir,
diff --git a/src/bindings/cxx/meson.build b/src/bindings/cxx/meson.build
index e62b7a2387..e9af295e0a 100644
--- a/src/bindings/cxx/meson.build
+++ b/src/bindings/cxx/meson.build
@@ -26,14 +26,14 @@ foreach lib : cxx_sublibs
tmp_package_subdirs = [package_version_name]
package_c_args = [
- '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"',
+ '-DPACKAGE_DATA_DIR="'+ dir_data / package_name + '"',
'-DNEED_RUN_IN_TREE=1'
]
- dir_package_modules = join_paths(dir_lib, package_name, 'modules')
+ dir_package_modules = dir_lib / package_name / 'modules'
cxx_generator_target = []
cxx_header_src = []
- file_location = join_paths('..', '..', 'lib', package_name)
+ file_location = '../../lib' / package_name
eo_file_list = []
eo_file_subdirs = get_variable(package_name + '_eo_subdirs')
#generate files for each .eo files
@@ -43,17 +43,17 @@ foreach lib : cxx_sublibs
else
cxx_pub_eot_files = get_variable(package_name +'_eot_files')
endif
- subdir_file_location = join_paths(file_location, eo_file_subdir)
+ subdir_file_location = file_location / eo_file_subdir
foreach cxx_gen_file : cxx_pub_eot_files
cxx_generator_target += custom_target('eolian_cxx_gen_'+cxx_gen_file.underscorify()+'',
- input : join_paths(subdir_file_location, cxx_gen_file),
+ input : subdir_file_location / cxx_gen_file,
output : [cxx_gen_file + '.hh'],
install : true,
- install_dir : join_paths(dir_include, package_version_name, eo_file_subdir),
+ install_dir : dir_include / package_version_name / eo_file_subdir,
command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', join_paths(meson.current_build_dir(), cxx_gen_file + '.hh'),
+ '-o', meson.current_build_dir() / cxx_gen_file + '.hh',
'@INPUT@'])
- eo_file_list += files(join_paths(subdir_file_location, cxx_gen_file))
+ eo_file_list += files(subdir_file_location / cxx_gen_file)
endforeach
if eo_file_subdir != ''
@@ -61,17 +61,17 @@ foreach lib : cxx_sublibs
else
cxx_pub_eo_files = get_variable(package_name +'_eo_files')
endif
- subdir_file_location = join_paths(file_location, eo_file_subdir)
+ subdir_file_location = file_location / eo_file_subdir
foreach cxx_gen_file : cxx_pub_eo_files
cxx_generator_target += custom_target('eolian_cxx_gen_'+cxx_gen_file.underscorify()+'',
- input : join_paths(subdir_file_location, cxx_gen_file),
+ input : subdir_file_location / cxx_gen_file,
output : [cxx_gen_file + '.hh', cxx_gen_file + '.impl.hh'],
install : true,
- install_dir : join_paths(dir_include, package_version_name, eo_file_subdir),
+ install_dir : dir_include / package_version_name / eo_file_subdir,
command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', join_paths(meson.current_build_dir(), cxx_gen_file + '.hh'),
+ '-o', meson.current_build_dir() / cxx_gen_file + '.hh',
'@INPUT@'])
- eo_file_list += files(join_paths(subdir_file_location, cxx_gen_file))
+ eo_file_list += files(subdir_file_location / cxx_gen_file)
endforeach
endforeach
@@ -81,7 +81,7 @@ foreach lib : cxx_sublibs
input : eo_file_list,
output : [lib[0] + '.eo.hh'],
install : true,
- install_dir : join_paths(dir_include, package_version_name),
+ install_dir : dir_include / package_version_name,
command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories, '-m',
'-o', '@OUTPUT@',
'@INPUT@'])
@@ -92,7 +92,7 @@ foreach lib : cxx_sublibs
subdir(package_name+'_cxx')
else
inc_dir = include_directories(file_location, '.')
- cxx_header_src += files(join_paths(file_location, lib[0]+'.hh'))
+ cxx_header_src += files(file_location / lib[0]+'.hh')
endif
dep = declare_dependency(
@@ -110,7 +110,7 @@ foreach lib : cxx_sublibs
endif
foreach subdir : get_variable(package_name + '_eo_subdirs')
- tmp_package_subdirs += join_paths(package_version_name, subdir)
+ tmp_package_subdirs += package_version_name / subdir
endforeach
install_headers(cxx_header_src,
diff --git a/src/bindings/lua/meson.build b/src/bindings/lua/meson.build
index a1dd6463ea..ffccc1f1d3 100644
--- a/src/bindings/lua/meson.build
+++ b/src/bindings/lua/meson.build
@@ -1,7 +1,7 @@
install_subdir('eina',
- install_dir : join_paths(dir_data, 'elua', 'modules')
+ install_dir : dir_data / 'elua/modules'
)
install_data(files(['eo.lua', 'eolian.lua']),
- install_dir : join_paths(dir_data, 'elua', 'modules')
+ install_dir : dir_data / 'elua/modules'
)
diff --git a/src/bindings/meson.build b/src/bindings/meson.build
index d7d7cba8be..466fa68478 100644
--- a/src/bindings/meson.build
+++ b/src/bindings/meson.build
@@ -9,9 +9,9 @@ endif
if (bindings.contains('cxx') == false and bindings.contains('mono'))
subdirs = ['eina_cxx', 'eolian_cxx']
- subdir(join_paths('cxx', 'eina_cxx'))
+ subdir('cxx/eina_cxx')
inc_dir = []
- subdir(join_paths('cxx', 'eolian_cxx'))
+ subdir('cxx/eolian_cxx')
eolian_cxx = declare_dependency(
include_directories: inc_dir,
dependencies : eolian
@@ -24,6 +24,6 @@ endif
foreach binding : bindings_order
if bindings.contains(binding)
- subdir(join_paths( binding))
+ subdir(binding)
endif
endforeach
diff --git a/src/bindings/mono/efl_mono/meson.build b/src/bindings/mono/efl_mono/meson.build
index abc78b5232..76714c3668 100644
--- a/src/bindings/mono/efl_mono/meson.build
+++ b/src/bindings/mono/efl_mono/meson.build
@@ -81,27 +81,27 @@ pub_eo_file_target = []
foreach eo_file : mono_eo_files
pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
- input : join_paths('..', '..', '..', 'lib', 'efl_mono', eo_file),
+ input : '../../../lib/efl_mono' / eo_file,
output : [eo_file + '.h'],
depfile : eo_file + '.d',
install : false,
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',
'-gchd', '@INPUT@'])
- # mono_eo_c_files += join_paths(meson.current_build_dir(), eo_file + '.c')
+ # mono_eo_c_files += meson.current_build_dir() / eo_file + '.c'
endforeach
efl_mono_lib = library('eflcustomexportsmono',
[
- join_paths('..', '..', '..', 'lib', 'efl_mono', 'efl_custom_exports_mono.c'),
- join_paths('..', '..', '..', 'lib', 'efl_mono', 'efl_mono_accessors.c'),
- join_paths('..', '..', '..', 'lib', 'efl_mono', 'efl_mono_model_internal.c'),
+ '../../../lib/efl_mono/efl_custom_exports_mono.c',
+ '../../../lib/efl_mono/efl_mono_accessors.c',
+ '../../../lib/efl_mono/efl_mono_model_internal.c',
],
pub_eo_file_target,
install : true,
- include_directories : config_dir + [include_directories(join_paths('.'))],
+ include_directories : config_dir + [include_directories('.')],
dependencies : [eo, eina, ecore],
version : meson.project_version()
)
@@ -109,11 +109,11 @@ efl_mono_lib = library('eflcustomexportsmono',
foreach eo_file : mono_eo_files
if not blacklisted_files.contains(eo_file)
mono_generator_target += custom_target('eolian_mono_gen_'+eo_file.underscorify()+'',
- input : join_paths('..', '..', '..', 'lib', 'efl_mono', eo_file),
+ input : '../../../lib/efl_mono' / eo_file,
output : [eo_file + '.cs'],
command : [eolian_mono_gen, beta_option, '-I', meson.current_source_dir(), eolian_include_directories,
'--dllimport', 'eflcustomexportsmono',
- '-o', join_paths(meson.current_build_dir(), eo_file + '.cs'),
+ '-o', meson.current_build_dir() / eo_file + '.cs',
'-e', get_option('mono-examples-dir'),
'@INPUT@'])
diff --git a/src/bindings/mono/eolian_mono/meson.build b/src/bindings/mono/eolian_mono/meson.build
index 3277ff645c..bfd4b922d3 100644
--- a/src/bindings/mono/eolian_mono/meson.build
+++ b/src/bindings/mono/eolian_mono/meson.build
@@ -2,10 +2,10 @@ cmake = import('cmake')
opt_var = cmake.subproject_options()
opt_var.set_override_option('cpp_std', 'c++17')
-inc_dir = include_directories(join_paths('..', '..', '..', 'bin', 'eolian_mono'))
+inc_dir = include_directories('../../../bin/eolian_mono')
eolian_mono_gen_bin = executable('eolian_mono',
- join_paths('..', '..', '..', 'bin', 'eolian_mono', 'eolian_mono.cc'),
+ '../../../bin/eolian_mono/eolian_mono.cc',
dependencies: [eina_cxx, eolian_cxx],
install: true,
include_directories : inc_dir,
diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build
index 111eb911ea..d1745bd36c 100644
--- a/src/bindings/mono/meson.build
+++ b/src/bindings/mono/meson.build
@@ -80,7 +80,7 @@ mono_files = []
foreach lib : mono_sublibs
package_name = lib[0].to_lower()
eo_file_subdirs = get_variable(package_name + '_eo_subdirs')
- file_location = join_paths('..', '..', 'lib', package_name)
+ file_location = '../../lib' / package_name
dllimport = package_name
if target_machine.system() == 'windows'
@@ -95,7 +95,7 @@ foreach lib : mono_sublibs
mono_pub_eo_files = get_variable(package_name +'_eo_files') + get_variable(package_name + '_eot_files')
endif
- subdir_file_location = join_paths(file_location, eo_file_subdir)
+ subdir_file_location = file_location / eo_file_subdir
foreach mono_gen_file : mono_pub_eo_files
if not blacklisted_files.contains(mono_gen_file)
partial = []
@@ -103,11 +103,11 @@ foreach lib : mono_sublibs
partial = '-p'
endif
mono_generator_target += custom_target('eolian_mono_gen_'+mono_gen_file.underscorify()+'',
- input : join_paths(subdir_file_location, mono_gen_file),
+ input : subdir_file_location / mono_gen_file,
output : [mono_gen_file + '.cs'],
command : [eolian_mono_gen, beta_option, '-I', meson.current_source_dir(), eolian_include_directories,
'--dllimport', dllimport,
- '-o', join_paths(meson.current_build_dir(), mono_gen_file + '.cs'),
+ '-o', meson.current_build_dir() / mono_gen_file + '.cs',
'-e', get_option('mono-examples-dir'), partial,
'@INPUT@'])
endif
@@ -140,8 +140,8 @@ if get_option('mono-beta')
extra_cs_args += '-d:EFL_BETA'
endif
-efl_mono_install_dir = join_paths(dir_lib, 'efl-mono-'+version_major)
-efl_mono_xml_doc = join_paths(meson.current_build_dir(), 'efl_mono.xml')
+efl_mono_install_dir = dir_lib / 'efl-mono-'+version_major
+efl_mono_xml_doc = meson.current_build_dir() / 'efl_mono.xml'
if (get_option('dotnet'))
styles = ['CA1000', 'CA1030', 'CA1031', 'CA1032', 'CA1034', 'CA1036', 'CA1040',
@@ -243,7 +243,7 @@ if (get_option('dotnet'))
lib_csproj_conf_data.set('NETSTANDARD_VERSION', dotnet_standard_version)
lib_csproj_conf_data.set('BINDING_SRC', meson.current_source_dir())
- lib_csproj_conf_data.set('CA_RULESET', join_paths(meson.build_root(), '@0@'.format(ca_ruleset)))
+ lib_csproj_conf_data.set('CA_RULESET', meson.build_root() / '@0@'.format(ca_ruleset))
lib_csproj_conf_data.set('EFL_VERSION', meson.project_version())
if get_option('mono-beta')
@@ -299,19 +299,19 @@ else
cs_args : extra_cs_args + ['-doc:' + efl_mono_xml_doc, '-warnaserror+'],
)
- meson.add_install_script(join_paths(meson.source_root(), 'meson', 'meson_csharp_docs.sh'),
+ meson.add_install_script(meson.source_root() / 'meson/meson_csharp_docs.sh',
efl_mono_xml_doc,
efl_mono_install_dir)
endif
-efl_mono_test_suite_path=join_paths(meson.current_build_dir())
+efl_mono_test_suite_path = meson.current_build_dir()
pkgconfig.generate(
name : 'efl-mono',
description : 'Efl C# bindings',
version : version_major + '.' + version_minor + '.' + version_micro,
libraries : ['-r:${assemblies_dir}/efl_mono.dll'],
- variables : ['assemblies_dir='+join_paths(dir_lib, 'efl-mono-'+version_major),
+ variables : ['assemblies_dir=' + dir_lib / 'efl-mono-'+version_major,
'mono_libs=-r:${assemblies_dir}/efl_mono.dll']
)
test_dirs += 'efl_mono'
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
