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 e4998a225dede6c0b26562caac23f5b601f78c43
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 7 12:29:28 2024 +0500
meson: join_path - clean root meson.build
---
meson.build | 89 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 44 insertions(+), 45 deletions(-)
diff --git a/meson.build b/meson.build
index c09ec01018..ff53a87a62 100644
--- a/meson.build
+++ b/meson.build
@@ -54,20 +54,20 @@ evas_loader_map = []
#install paths
dir_prefix = get_option('prefix')
-dir_sysconf = join_paths(dir_prefix, get_option('sysconfdir'))
-dir_bin = join_paths(dir_prefix, get_option('bindir'))
-dir_data = join_paths(dir_prefix, get_option('datadir'))
-dir_include = join_paths(dir_prefix, get_option('includedir'))
-dir_lib = join_paths(dir_prefix, get_option('libdir'))
+dir_sysconf = dir_prefix / get_option('sysconfdir')
+dir_bin = dir_prefix / get_option('bindir')
+dir_data = dir_prefix / get_option('datadir')
+dir_include = dir_prefix / get_option('includedir')
+dir_lib = dir_prefix / get_option('libdir')
#local paths
-local_lib = join_paths('src', 'lib')
-local_bindings = join_paths('src', 'bindings')
-local_bin = join_paths('src', 'bin')
-local_module = join_paths('src', 'modules')
-local_tests = join_paths('src', 'tests')
-local_benchmark = join_paths('src', 'benchmarks')
-local_examples = join_paths('src', 'examples')
+local_lib = 'src/lib'
+local_bindings = 'src/bindings'
+local_bin = 'src/bin'
+local_module = 'src/modules'
+local_tests = 'src/tests'
+local_benchmark = 'src/benchmarks'
+local_examples = 'src/examples'
dev_cflags = []
dev_cflags_try = [
@@ -132,7 +132,7 @@ config_h.set_quoted('MODULE_ARCH', version_name)
config_h.set_quoted('PACKAGE', meson.project_name())
config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
config_h.set_quoted('VERSION', meson.project_version())
-config_h.set_quoted('LOCALE_DIR', join_paths([dir_prefix, 'share/locale']))
+config_h.set_quoted('LOCALE_DIR', dir_prefix / 'share/locale')
config_h.set_quoted('PACKAGE_URL', 'https://www.enlightenment.org')
config_h.set_quoted('PACKAGE_TARNAME', meson.project_name())
config_h.set_quoted('PACKAGE_BUGREPORT', 'enlightenment-devel@lists.sourceforge.net')
@@ -253,7 +253,7 @@ subdir('header_checks')
subdir('po')
if get_option('wl')
- subdir(join_paths('src', 'wayland_protocol'))
+ subdir('src/wayland_protocol')
endif
ecore_evas_wayland_engine_include_dir = []
@@ -359,7 +359,7 @@ config_dir += include_directories('.')
#we have to do that first, eina modules are required by eina
#the other modules require theire package
-subdir(join_paths(local_module, 'eina'))
+subdir(local_module / 'eina')
# List of dependency objects that might be disabled due to configurations
# If they are enabled, the object gets overwritten by the library file.
@@ -381,8 +381,8 @@ foreach package : subprojects
if package[1].length() == 0 or get_option(package[1][0])
config_h.set('HAVE_' + package_name.to_upper().underscorify(), '1')
- dir_package_include = join_paths(dir_include, package_version_name)
- dir_package_modules = join_paths(dir_lib, package_name, 'modules')
+ dir_package_include = dir_include / package_version_name
+ dir_package_modules = dir_lib / package_name / 'modules'
# ensure that we really dont copy the eo file targets from a previous
# library Those are the variables that can be used to reflect the libraries
@@ -407,18 +407,18 @@ foreach package : subprojects
foreach static_lib : package[10]
if get_variable(static_lib, tmp_empty) == tmp_empty
- subdir(join_paths('src', 'static_libs', static_lib))
+ subdir('src/static_libs' / static_lib)
endif
endforeach
#package_c_args definition for lib and module
package_c_args = [
- '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"',
+ '-DPACKAGE_DATA_DIR="'+ (dir_data / package_name)+'"',
'-DNEED_RUN_IN_TREE=1',
'-DEFL_BUILD=1',
]
if package[3]
- subdir(join_paths(local_lib, package_name))
+ subdir(local_lib / package_name)
set_variable(package_name + '_eo_files', pub_eo_files)
set_variable(package_name + '_eot_files', pub_eo_types_files)
set_variable(package_name + '_header_subdirs', package_header_subdirs)
@@ -426,10 +426,10 @@ foreach package : subprojects
if (package[8] and get_option('efl-one'))
src = ""
external_deps = get_variable(package_name+'_ext_deps')
- efl_one_include_dirs += [include_directories('.'), include_directories(join_paths(local_lib, package_name))]
+ efl_one_include_dirs += [include_directories('.'), include_directories(local_lib / package_name)]
foreach subdirs : package_eo_subdirs
- efl_one_include_dirs += include_directories(join_paths(local_lib, package_name))
+ efl_one_include_dirs += include_directories(local_lib / package_name)
endforeach
tmp = static_library('efl_one_part_'+package_name,
@@ -449,11 +449,11 @@ foreach package : subprojects
#special case for eolian, this is never efl-one, but will be required in the library
if (package_name == 'eolian')
package_c_args = [
- '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"',
+ '-DPACKAGE_DATA_DIR="'+ (dir_data / package_name)+'"',
'-DNEED_RUN_IN_TREE=1',
]
if (package[4])
- subdir(join_paths(local_bin, package_name))
+ subdir(local_bin / package_name)
endif
endif
if package[6]
@@ -473,7 +473,7 @@ foreach package : subprojects
tmp_package_subdirs = []
foreach subdir : package_header_subdirs
- tmp_package_subdirs += join_paths(package_version_name, subdir)
+ tmp_package_subdirs += (package_version_name / subdir)
endforeach
if (package[8] and get_option('efl-one'))
efl_one_sub_dirs += [package_version_name] + tmp_package_subdirs
@@ -540,36 +540,35 @@ endif
foreach package : subprojects
package_name = package[0]
if package[1].length() == 0 or get_option(package[1][0])
- dir_package_include = join_paths(dir_include, package_version_name)
- dir_package_modules = join_paths(dir_lib, package_name, 'modules')
+ dir_package_include = dir_include / package_version_name
+ dir_package_modules = dir_lib / package_name / 'modules'
package_c_args = [
- '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"',
+ '-DPACKAGE_DATA_DIR="'+ (dir_data / package_name)+'"',
'-DNEED_RUN_IN_TREE=1',
'-DEFL_BUILD=1',
]
if (package[2])
- subdir(join_paths(local_module, package_name))
+ subdir(local_module / package_name)
endif
package_c_args = [
- '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, package_name)+'"',
+ '-DPACKAGE_DATA_DIR="' + dir_data / package_name + '"',
'-DNEED_RUN_IN_TREE=1',
]
if (package[4] and package_name != 'eolian')
- subdir(join_paths(local_bin, package_name))
+ subdir(local_bin / package_name)
endif
if (package[5])
- subdir(join_paths(local_benchmark, package_name))
+ subdir(local_benchmark / package_name)
endif
endif
endforeach
#build this later, as the debug services are depending on ecore
-subdir(join_paths('src', 'bin', 'efl'))
-
-subdir(join_paths('src', 'generic', 'evas'))
-subdir(join_paths('src', 'bindings'))
-subdir(join_paths('src', 'edje_external'))
-subdir(join_paths('data'))
+subdir('src/bin/efl')
+subdir('src/generic/evas')
+subdir('src/bindings')
+subdir('src/edje_external')
+subdir('data')
if get_option('build-tests')
check = dependency('check')
@@ -585,23 +584,23 @@ if get_option('build-tests')
test_env.set('ASAN_OPTIONS', 'detect_leaks=0:detect_odr_violation=0')
endif
- subdir(join_paths('src', 'tests'))
+ subdir('src/tests')
foreach test : test_dirs
package_c_args = [
- '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, test)+'"',
+ '-DPACKAGE_DATA_DIR="'+ dir_data / test +'"',
'-DNEED_RUN_IN_TREE=1',
]
- subdir(join_paths(local_tests, test))
+ subdir(local_tests / test)
endforeach
endif
if get_option('build-examples')
foreach example : example_dirs
package_c_args = [
- '-DPACKAGE_DATA_DIR="'+ join_paths(dir_data, example)+'"',
+ '-DPACKAGE_DATA_DIR="' + dir_data / example +'"',
'-DNEED_RUN_IN_TREE=1',
]
- subdir(join_paths(local_examples, example))
+ subdir(local_examples / example)
endforeach
endif
@@ -643,9 +642,9 @@ configure_file(
)
configure_file(
- input: join_paths('src','lib', 'efl', 'Efl_Config.h.in'),
+ input: 'src/lib/efl/Efl_Config.h.in',
output: 'Efl_Config.h',
- install_dir : join_paths(dir_include,'eina-'+version_major),
+ install_dir : dir_include / 'eina-'+version_major,
configuration: efl_config_h
)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
