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 e4d37219c704e1ca913165cd119789d46f8f989e
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 7 12:45:09 2024 +0500
meson: join_path - clean doc
---
doc/meson.build | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/doc/meson.build b/doc/meson.build
index 5ad389828c..d325d2f102 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -88,14 +88,14 @@ widget_previews = [
]
preview_text_filter = executable('preview_text_filter',
- join_paths('previews', 'preview_text_filter.c'),
+ 'previews/preview_text_filter.c',
include_directories : config_dir,
dependencies: [ecore_evas],
build_by_default: false,
)
widget_preview_eps = custom_target('widget_preview_prefs_epc',
- input: join_paths('widgets', 'widget_preview_prefs.epc'),
+ input: 'widgets/widget_preview_prefs.epc',
output: 'widget_preview_prefs.epb',
command: elm_prefs_cc_exe + ['@INPUT@', '@OUTPUT@'],
build_by_default: false,
@@ -109,12 +109,12 @@ foreach text_filter_property : text_filter_properties
font = text_filter_property[1]
size = text_filter_property[2]
name = text_filter_property[3]
- filter_code = run_command('cat', join_paths(meson.source_root(), 'src', 'examples', 'evas', 'filters', 'filter_'+name+'.lua'))
+ filter_code = run_command('cat', meson.source_root() / 'src/examples/evas/filters/filter_'+name+'.lua'))
doc_target += custom_target('preview_text_filters_'+name,
command: [
env, 'EFL_RUN_IN_TREE=1',
- 'EFL_EVAS_FILTER_LUA_PREFIX=' + join_paths(meson.source_root(), 'src', 'lib', 'evas'),
+ 'EFL_EVAS_FILTER_LUA_PREFIX=' + meson.source_root() / 'src/lib/evas',
preview_text_filter.full_path(), text, filter_code.stdout(), '@OUTPUT@', font, size
],
depends: preview_text_filter,
@@ -128,14 +128,14 @@ foreach widget_preview : widget_previews
if get_variable(binary, preview_text_filter) == preview_text_filter
tmp = executable(binary,
- join_paths('widgets', binary+'.c'),
+ 'widgets' / binary+'.c',
dependencies: elementary,
build_by_default: false,
c_args : [
- '-DPACKAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
- '-DDOCW_DIR="'+meson.current_build_dir()+'"']
+ '-DPACKAGE_DATA_DIR="' + meson.source_root() / 'data/elementary') + '"',
+ '-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
+ '-DTESTS_SRC_DIR="' + meson.current_source_dir() + '"',
+ '-DDOCW_DIR="' + meson.current_build_dir() + '"']
)
set_variable(binary, tmp)
endif
@@ -152,7 +152,7 @@ foreach widget_preview : widget_previews
widget_executable = get_variable(binary)
- screen_shot_dir = join_paths(meson.build_root(), 'html', 'img', 'widget', directory)
+ screen_shot_dir = meson.build_root() / 'html/img/widget' / directory
create_preview = custom_target('widget_preview_'+('_'.join([directory, ss, x, y])),
command: [shot_sh, screen_shot_dir, ss, widget_executable.full_path(), x, y],
@@ -166,7 +166,7 @@ foreach widget_preview : widget_previews
# for now this means that no images will be in the latex documentation
#
#convert_preview = custom_target('convert_preview_'+('_'.join([directory, ss, x, y])),
- # command: [convert, join_paths(screen_shot_dir, ss), join_paths(screen_shot_dir, ss.split('.')[0]+'.eps')],
+ # command: [convert, screen_shot_dir / ss, screen_shot_dir / ss.split('.')[0]+'.eps'],
# output: '-'.join([directory, ss, x, y])+'.eps',
# depends: [create_preview],
# build_by_default: false,
@@ -175,13 +175,13 @@ foreach widget_preview : widget_previews
endforeach
doc_target += custom_target('doxygen',
- command: [doxygen, join_paths(meson.current_build_dir(), 'Doxyfile')],
+ command: [doxygen, meson.current_build_dir() / 'Doxyfile'],
output: ['empty'],
build_by_default: false
)
compress_target = custom_target('package_doc_tar',
- command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'],
+ command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-' + meson.project_version() + '-doc.tar.xz', 'html', 'man'],
output: 'efl-'+meson.project_version()+'-doc.tar.xz',
depends: [doc_target],
build_by_default: false
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
