This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/47/head
in repository efl.
View the commit online.
commit 41e250760b0b2e1372456b7c56353182cb9e50f5
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Dec 4 19:22:49 2023 +0500
meson: make source and build_root functions version specific
---
meson.build | 36 ++++++++++++++++++++++--------------
src/lib/evas/meson.build | 8 ++++----
src/tests/elementary/meson.build | 2 +-
3 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/meson.build b/meson.build
index d0b98e423d..25b0431d6d 100644
--- a/meson.build
+++ b/meson.build
@@ -12,6 +12,14 @@ else
build_root = meson.build_root()
endif
+if meson.version().version_compare('>=0.56')
+ source_root = meson.project_source_root()
+ build_root = meson.project_build_root()
+else
+ source_root = meson.source_root()
+ build_root = meson.build_root()
+endif
+
pkgconfig = import('pkgconfig')
name = meson.project_name()
@@ -123,20 +131,20 @@ endif
env = find_program('env', native: true)
config_h = configuration_data()
-config_h.set_quoted('MODULE_ARCH' , version_name)
-config_h.set_quoted('PACKAGE' , name)
-config_h.set_quoted('PACKAGE_VERSION' , version)
-config_h.set_quoted('VERSION' , version)
-config_h.set_quoted('LOCALE_DIR' , join_paths([dir_prefix, 'share/locale']))
-config_h.set_quoted('PACKAGE_URL' , 'https://www.enlightenment.org')
-config_h.set_quoted('PACKAGE_TARNAME' , name)
-config_h.set_quoted('PACKAGE_BUGREPORT' , 'enlightenment-devel@lists.sourceforge.net')
-config_h.set_quoted('PACKAGE_STRING' , name + ' ' + 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_root)
-config_h.set_quoted('PACKAGE_BUILD_DIR' , meson.current_build_dir())
+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('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')
+config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
+config_h.set_quoted('PACKAGE_NAME', meson.project_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', meson.project_source_root())
+config_h.set_quoted('PACKAGE_BUILD_DIR', meson.current_build_dir())
config_h.set_quoted('PACKAGE_SYSCONF_DIR', dir_sysconf)
config_h.set_quoted('BINDIR' , dir_bin)
config_h.set10('EFL_HAVE_THREADS', true)
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 5cfc9ee6ea..71482cf27b 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -296,8 +296,8 @@ foreach loader_inst : evas_vg_loaders_file
loader = loader_inst[0]
loader_deps = loader_inst[1]
- if get_option('evas-loaders-disabler').contains(loader) == false
- file = join_paths(source_root, 'src', 'modules', 'evas', 'vg_loaders', loader, 'evas_vg_load_'+loader+'.c')
+ if (get_option('evas-loaders-disabler').contains(loader) == false)
+ file = join_paths(meson.project_source_root(), 'src', 'modules', 'evas', 'vg_loaders', loader, 'evas_vg_load_'+loader+'.c')
evas_static_list += [declare_dependency(
sources: file,
dependencies: loader_deps,
@@ -307,8 +307,8 @@ foreach loader_inst : evas_vg_loaders_file
endforeach
foreach loader : evas_vg_savers_file
- if get_option('evas-loaders-disabler').contains(loader) == false
- file = join_paths(source_root, 'src', 'modules', 'evas', 'vg_savers', loader, 'evas_vg_save_'+loader+'.c')
+ if (get_option('evas-loaders-disabler').contains(loader) == false)
+ file = join_paths(meson.project_source_root(), 'src', 'modules', 'evas', 'vg_savers', loader, 'evas_vg_save_'+loader+'.c')
evas_static_list += [declare_dependency(
sources: file,
dependencies: [eo, ector, emile, freetype, eet],
diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index 444fdcc322..5089609b0f 100644
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -194,7 +194,7 @@ executable('efl_ui_window_cnp_dnd_slave',
test('elementary-suite', elementary_suite,
env : test_env,
- timeout : master_timeout
+ timeout: 60
)
test('efl-ui-suite', efl_ui_suite,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
