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 0e2b3d3490bf25e66c818da89f313558a8c6e866
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 21 15:08:10 2024 +0500
meson: options - align and clean
---
meson/options/meson.build | 89 +++++++++++++++++++++---------------------
meson_options.txt | 10 ++---
src/lib/eeze/meson.build | 2 +-
src/lib/elementary/meson.build | 2 +-
src/lib/evas/meson.build | 32 +++++++--------
5 files changed, 67 insertions(+), 68 deletions(-)
diff --git a/meson/options/meson.build b/meson/options/meson.build
index e998dfc078..25f3ab0a07 100644
--- a/meson/options/meson.build
+++ b/meson/options/meson.build
@@ -1,53 +1,52 @@
-WITH_AUDIO = get_option('audio')
-WITH_AVAHI = get_option('avahi')
-WITH_X11 = get_option('x11')
-WITH_XPRESENT = get_option('xpresent')
-WITH_XINPUT2 = get_option('xinput2')
-WITH_XINPUT22 = get_option('xinput22')
-WITH_FB = get_option('fb')
-WITH_TSLIB = get_option('tslib')
-WITH_SDL = get_option('sdl')
-WITH_WL = get_option('wl')
-WITH_DRM = get_option('drm')
-WITH_COCOA = get_option('cocoa')
-WITH_PHYSICS = get_option('physics')
-WITH_GSTREAMER = get_option('gstreamer')
-WITH_SYSTEMD = get_option('systemd')
-WITH_PULSEAUDIO = get_option('pulseaudio')
-WITH_HARFBUZZ = get_option('harfbuzz')
-WITH_FRIBIDI = get_option('fribidi')
-WITH_FONTCONFIG = get_option('fontconfig')
-WITH_MOUNT = get_option('libmount')
-WITH_VNC_SERVER = get_option('vnc-server')
-WITH_V4L2 = get_option('v4l2')
-WITH_ELUA = get_option('elua')
-WITH_PIXMAN = get_option('pixman')
-WITH_HYPHEN = get_option('hyphen')
-WITH_EXAMPLES = get_option('build-examples')
-WITH_TESTS = get_option('build-tests')
-WITH_LOCALIZATION = get_option('nls')
-WITH_DOCS = get_option('docs')
-WITH_OPTIMIZATION = get_option('native-arch-optimization')
-LUA_INTERPRETER = get_option('lua-interpreter')
-CRYPTO = get_option('crypto')
-BUILD_ID = get_option('build-id')
-MAX_FD_SIZE = get_option('max-fd-size')
-WITH_EFL_ONE = get_option('efl-one')
-WITH_EMBEDDED_DRM = get_option('embedded-libdrm')
-WITH_EMBEDDED_LZ4 = get_option('embedded-lz4')
+WITH_AUDIO = get_option('audio')
+WITH_AVAHI = get_option('avahi')
+WITH_X11 = get_option('x11')
+WITH_XPRESENT = get_option('xpresent')
+WITH_XINPUT2 = get_option('xinput2')
+WITH_XINPUT22 = get_option('xinput22')
+WITH_FB = get_option('fb')
+WITH_TSLIB = get_option('tslib')
+WITH_SDL = get_option('sdl')
+WITH_WL = get_option('wl')
+WITH_DRM = get_option('drm')
+WITH_COCOA = get_option('cocoa')
+WITH_PHYSICS = get_option('physics')
+WITH_GSTREAMER = get_option('gstreamer')
+WITH_SYSTEMD = get_option('systemd')
+WITH_PULSEAUDIO = get_option('pulseaudio')
+WITH_HARFBUZZ = get_option('harfbuzz')
+WITH_FRIBIDI = get_option('fribidi')
+WITH_FONTCONFIG = get_option('fontconfig')
+WITH_MOUNT = get_option('libmount')
+WITH_VNC_SERVER = get_option('vnc-server')
+WITH_V4L2 = get_option('v4l2')
+WITH_ELUA = get_option('elua')
+WITH_PIXMAN = get_option('pixman')
+WITH_HYPHEN = get_option('hyphen')
+WITH_EXAMPLES = get_option('build-examples')
+WITH_TESTS = get_option('build-tests')
+WITH_LOCALIZATION = get_option('nls')
+WITH_DOCS = get_option('docs')
+WITH_OPTIMIZATION = get_option('native-arch-optimization')
+WITH_EFL_ONE = get_option('efl-one')
+WITH_EMBEDDED_DRM = get_option('embedded-libdrm')
+WITH_EMBEDDED_LZ4 = get_option('embedded-lz4')
WITH_EMBEDDED_UNIBREAK = get_option('embedded-libunibreak')
-INSTALL_EO_FILES = get_option('install-eo-files')
-WITH_EEZE = get_option('eeze')
-WITH_GLIB = get_option('glib')
-WITH_GLIB_MAINLOOP = get_option('glib-mainloop')
-DEBUG_EINA_MAGIC = get_option('debug-eina-magic')
-DEBUG_THREADS = get_option('debug-threads')
-OPENGL = get_option('opengl')
+WITH_EEZE = get_option('eeze')
+WITH_GLIB = get_option('glib')
+WITH_GLIB_MAINLOOP = get_option('glib-mainloop')
+DEBUG_EINA_MAGIC = get_option('debug-eina-magic')
+DEBUG_THREADS = get_option('debug-threads')
+LUA_INTERPRETER = get_option('lua-interpreter')
+CRYPTO = get_option('crypto')
+BUILD_ID = get_option('build-id')
+MAX_FD_SIZE = get_option('max-fd-size')
+INSTALL_EO_FILES = get_option('install-eo-files')
+OPENGL = get_option('opengl')
# WITH_JSON = get_option('evas-loaders-disabler').contains('json')
# option('efl-one')
-# option('native-arch-optimization')
# option('bindings')
# option('network-backend')
diff --git a/meson_options.txt b/meson_options.txt
index b7a739792c..d2988e379c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -58,14 +58,14 @@ option('evas-loaders-disabler', value: ['json', 'avif', 'heif', 'jxl'],
'gif', 'ico', 'jp2k', 'jpeg', 'pmaps', 'png', 'psd', 'tga', 'tgv', 'tiff', 'wbmp', 'webp', 'xpm', 'json', 'avif', 'heif', 'jxl'])
option('ecore-imf-loaders-disabler', value: ['ibus'], type: 'array', description: 'Choose: disabled input methods',
choices: ['', 'xim', 'ibus', 'scim'])
-option('eject-path', value: 'detect', type: 'string', description: 'Path: eject binary (if "detect" internal eeze bins are used)')
-option('mount-path', value: 'detect', type: 'string', description: 'Path: mount binary (if "detect" internal eeze bins are used)')
-option('unmount-path', value: 'detect', type: 'string', description: 'Path: unmount binary (if "detect" internal eeze bins are used)')
+option('path-eject', value: 'detect', type: 'string', description: 'Path: eject binary (if "detect" internal eeze bins are used)')
+option('path-mount', value: 'detect', type: 'string', description: 'Path: mount binary (if "detect" internal eeze bins are used)')
+option('path-unmount', value: 'detect', type: 'string', description: 'Path: unmount binary (if "detect" internal eeze bins are used)')
option('build-id', value: 'none', type: 'string', description: 'String: build id set as the EFL_BUILD_ID')
option('max-fd-size', value: '8192', type: 'string', description: 'String: maximim set of fds and thus maximum fd value allowed +1 in the ecore main loop handler')
-option('dictionaries-hyphen-dir', value: '/usr/share/hyphen/',
+option('dir-hyphen', value: '/usr/share/hyphen/',
type: 'string', description: 'Path: hyphen dictionaries directory')
-option('elementary-base-dir', value: '.elementary',
+option('dir-elementary-base', value: '.elementary',
type: 'string', description: 'String: directory name for user supplied elementary data files like themes, config files')
# mono
diff --git a/src/lib/eeze/meson.build b/src/lib/eeze/meson.build
index c4061f9274..a30b2ac883 100644
--- a/src/lib/eeze/meson.build
+++ b/src/lib/eeze/meson.build
@@ -59,7 +59,7 @@ if udev_dep.version() < '199'
endif
foreach option : options_to_check
- val = get_option(option+'-path')
+ val = get_option('path-' + option)
if val == 'detect'
# i dont know why we call this unmount when the bin is called umount
if option == 'unmount'
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index b7cd3dfa89..2b748d6f6f 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -958,7 +958,7 @@ elm_options = configuration_data()
config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root())
config_h.set_quoted('MODULES_PATH', dir_lib / 'modules')
-config_h.set_quoted('ELEMENTARY_BASE_DIR', get_option('elementary-base-dir'))
+config_h.set_quoted('ELEMENTARY_BASE_DIR', get_option('dir-elementary-base'))
config_h.set_quoted('ICON_DIR', dir_lib / 'icons')
if not WINDOWS
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index ecf00d9adf..25d65c7181 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -116,7 +116,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
evas_src += pub_eo_file_target
-evas_header_src = [
+evas_header_src = files(
'evas_api.h',
'Evas.h',
'Evas_Common.h',
@@ -125,7 +125,7 @@ evas_header_src = [
'Evas_Legacy.h',
'Evas_Loader.h',
'Efl_Canvas.h',
-]
+)
evas_include_directories += [
include_directories('.'),
@@ -163,7 +163,7 @@ endif
if WITH_HYPHEN
config_h.set('HAVE_HYPHEN', '1')
evas_ext_none_static_deps += hyphen_dep
- config_h.set_quoted('EVAS_DICTS_HYPHEN_DIR', get_option('dictionaries-hyphen-dir'))
+ config_h.set_quoted('EVAS_DICTS_HYPHEN_DIR', get_option('dir-hyphen'))
endif
subdir('include')
@@ -232,7 +232,7 @@ if cpu_sse3 or cpu_neon and not cpu_neon_intrinsics
c_args: native_arch_opt_c_args,
dependencies: [eina, eo, ector, emile, evas_deps, evas_ext_none_static_deps],
)
- evas_link += [ evas_opt ]
+ evas_link += evas_opt
endif
foreach loader_inst : evas_image_loaders_file
@@ -241,13 +241,13 @@ foreach loader_inst : evas_image_loaders_file
loader_deps = loader_inst[2]
if not get_option('evas-loaders-disabler').contains(loader)
if loader_type == 'static'
- config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
+ config_h.set('BUILD_LOADER_' + loader.to_upper(), '1')
file = meson.source_root() / 'src/modules/evas/image_loaders/' / loader / 'evas_image_load_'+loader+'.c'
config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
- evas_static_list += [declare_dependency(
+ evas_static_list += declare_dependency(
sources: file,
dependencies: loader_deps,
- )]
+ )
endif
else
message('Image loader '+loader+' disabled')
@@ -260,13 +260,13 @@ foreach loader_inst : evas_image_savers_file
loader_deps = loader_inst[2]
if not get_option('evas-loaders-disabler').contains(loader)
if loader_type == 'static'
- config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
+ config_h.set('BUILD_LOADER_' + loader.to_upper(), '1')
file = meson.source_root() / 'src/modules/evas/image_savers' / loader / 'evas_image_save_'+loader+'.c'
config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
- evas_static_list += [declare_dependency(
+ evas_static_list += declare_dependency(
sources: file,
dependencies: loader_deps,
- )]
+ )
endif
else
message('Image saver '+loader+' disabled')
@@ -279,22 +279,22 @@ foreach loader_inst : evas_vg_loaders_file
if not get_option('evas-loaders-disabler').contains(loader)
file = meson.source_root() / 'src/modules/evas/vg_loaders' / loader / 'evas_vg_load_'+loader+'.c'
- evas_static_list += [declare_dependency(
+ evas_static_list += declare_dependency(
sources: file,
dependencies: loader_deps,
- )]
- config_h.set('EVAS_STATIC_BUILD_VG_'+loader.to_upper(), '1')
+ )
+ config_h.set('EVAS_STATIC_BUILD_VG_' + loader.to_upper(), '1')
endif
endforeach
foreach loader : evas_vg_savers_file
if not get_option('evas-loaders-disabler').contains(loader)
file = meson.source_root() / 'src/modules/evas/vg_savers' / loader / 'evas_vg_save_'+loader+'.c'
- evas_static_list += [declare_dependency(
+ evas_static_list += declare_dependency(
sources: file,
dependencies: [eo, ector, emile, freetype, eet],
- )]
- config_h.set('EVAS_STATIC_BUILD_VG_'+loader.to_upper(), '1')
+ )
+ config_h.set('EVAS_STATIC_BUILD_VG_' + loader.to_upper(), '1')
endif
endforeach
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
