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 fa379ef5e816659abca66eb46d4d4eab0f86f290
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 21 13:03:33 2024 +0500
meson: remove join_path
---
meson.build | 75 +++++++++++++++++++++++++++++--------------------------------
1 file changed, 35 insertions(+), 40 deletions(-)
diff --git a/meson.build b/meson.build
index c8b868380e..d060ce6770 100644
--- a/meson.build
+++ b/meson.build
@@ -35,15 +35,15 @@ subdir('meson/optimizations')
subdir('meson/headers')
config_h.set_quoted('MODULE_ARCH', version_name)
-config_h.set_quoted('PACKAGE', meson.project_name())
+config_h.set_quoted('PACKAGE', name)
config_h.set_quoted('PACKAGE_VERSION', efl_version)
config_h.set_quoted('VERSION', efl_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_TARNAME', name)
config_h.set_quoted('PACKAGE_BUGREPORT', 'enlightenment-devel@lists.sourceforge.net')
-config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + efl_version)
-config_h.set_quoted('PACKAGE_NAME', meson.project_name())
+config_h.set_quoted('PACKAGE_STRING', name + ' ' + efl_version)
+config_h.set_quoted('PACKAGE_NAME', name)
config_h.set_quoted('PACKAGE_BIN_DIR', dir_bin)
config_h.set_quoted('PACKAGE_LIB_DIR', dir_lib)
config_h.set_quoted('PACKAGE_SRC_DIR', source_dir)
@@ -103,17 +103,14 @@ if WITH_WL
subdir('src/wayland_protocol')
endif
-inc_config = include_directories('.')
-
# we have to do that first, shared modules are required by shared
-# the other modules require theire package
-subdir(join_paths(local_module,'eina'))
+# the other modules require their package
+subdir(local_module / 'eina')
subprojects = [
# [0]name |[1]option |[2]mod |[3]lib |[4]bin |[5]bench |[6]tests |[7]examples |[8]true if build in efl-one |[9]pkg-config options |[10]name of static libs
['evil' ,[] , false, true, false, false, false, false, true, [], []],
['eina' ,[] , false, true, true, true, true, true, true, [], []],
- # ['efl_memory' ,[] , false, true, false, false, false, false, false, [], []],
['eolian' ,[] , false, true, true, false, true, false, false, ['eina'], []],
['eo' ,[] , false, true, false, true, true, false, true, ['eina'], []],
['efl' ,[] , false, true, false, false, true, false, true, ['eo'], []],
@@ -170,19 +167,18 @@ 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
- # speical handlings -> at the end is used to indicate where to find this
+ # special handlings -> at the end is used to indicate where to find this
# variable outside of this for loop
# public eo and eot files - which probebly have to be used later for bindings
pub_eo_files = [] # -> package_name + '_eo_files'
pub_eo_types_files = [] # -> package_name + '_eot_files'
- # All subdirs where eo files that are listed in the pub_* variables can be
- # found
+ # All subdirs where eo files that are listed in the pub_* variables can be found
# For every element != '' a variable called package_name + '_' + subir + '_eot_files' and package_name + '_' + subir + '_eo_files' must exist.
package_eo_subdirs = [''] # -> package_name + '_eo_subdirs'
# All subdirs that should be included in order to include every requried header
@@ -209,19 +205,19 @@ foreach package : subprojects
endif
endif
if not visited.contains(static_lib) and var.type_name() == 'internal' and embedded
- subdir(join_paths('src/static_libs', static_lib))
+ subdir('src/static_libs' / static_lib)
visited += 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)
@@ -229,10 +225,10 @@ foreach package : subprojects
if (package[8] and WITH_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,
@@ -252,18 +248,18 @@ 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]
- test_dirs += [package_name]
+ test_dirs += package_name
endif
if package[7]
- example_dirs += [package_name]
+ example_dirs += package_name
endif
set_variable('build_' + package_name.underscorify(), true)
@@ -276,7 +272,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 WITH_EFL_ONE
efl_one_sub_dirs += [package_version_name] + tmp_package_subdirs
@@ -301,7 +297,6 @@ foreach package : subprojects
endif
summary_pkg += {package_name: true}
else
- # message(package_name+' disabled!')
summary_pkg += {package_name: false}
endif
endforeach
@@ -344,25 +339,25 @@ 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
@@ -370,7 +365,7 @@ endforeach
#build this later, as the debug services are depending on ecore
subdir('src/bin/efl') #build this later, as the debug services are depending on ecore
subdir('src/generic/evas')
-# subdir('cmakeconfig') # why we need this!
+# subdir('cmakeconfig') # why we need this! for cxx?
subdir('src/bindings')
subdir('src/edje_external')
subdir('data')
@@ -414,20 +409,20 @@ if WITH_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 WITH_EXAMPLES
foreach example : dir_example
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
@@ -468,7 +463,7 @@ configure_file(
configure_file(
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
)
@@ -485,7 +480,7 @@ efl_20_pc_files = {
foreach name, libraries : efl_20_pc_files
pkgconfig.generate(
name : '-'.join(name.split('_')),
- description: name+' configutation file',
+ description: name + ' configutation file',
requires : libraries,
)
endforeach
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
