forked from enlightenment/efl
Compare commits
5 Commits
9d7fc64ca3
...
8beff7c4a1
Author | SHA1 | Date |
---|---|---|
Dmitri Chudinov | 8beff7c4a1 | |
Dmitri Chudinov | 44b009c129 | |
Dmitri Chudinov | 9f974d5eae | |
Dmitri Chudinov | 808423d71b | |
Dmitri Chudinov | c7007dd50b |
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
cmake_src = [
|
cmake_src = [
|
||||||
'Ecore',
|
'Ecore',
|
||||||
'EcoreCxx',
|
'EcoreCxx',
|
||||||
|
@ -39,21 +38,21 @@ foreach cmake_file : cmake_src
|
||||||
input: cmake_file+'Config.cmake.in',
|
input: cmake_file+'Config.cmake.in',
|
||||||
output: cmake_file+'Config.cmake',
|
output: cmake_file+'Config.cmake',
|
||||||
install_dir: join_paths(dir_lib, 'cmake', cmake_file),
|
install_dir: join_paths(dir_lib, 'cmake', cmake_file),
|
||||||
copy: true,
|
configuration : conf
|
||||||
)
|
)
|
||||||
if cmake_version_src.contains(cmake_src)
|
if cmake_version_src.contains(cmake_src)
|
||||||
configure_file(
|
configure_file(
|
||||||
input: cmake_version_file+'ConfigVersion.cmake.in',
|
input: cmake_version_file+'ConfigVersion.cmake.in',
|
||||||
output: cmake_version_file+'ConfigVersion.cmake',
|
output: cmake_version_file+'ConfigVersion.cmake',
|
||||||
install_dir: join_paths(dir_lib, 'cmake', cmake_version_file),
|
install_dir: join_paths(dir_lib, 'cmake', cmake_version_file),
|
||||||
configuration : conf,
|
configuration : conf
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'EflConfigVersion.cmake.in',
|
input: 'EflConfigVersion.cmake.in',
|
||||||
output: cmake_file+'ConfigVersion.cmake',
|
output: cmake_file+'ConfigVersion.cmake',
|
||||||
install_dir: join_paths(dir_lib, 'cmake', cmake_file),
|
install_dir: join_paths(dir_lib, 'cmake', cmake_file),
|
||||||
configuration : conf,
|
configuration : conf
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
|
@ -62,5 +61,5 @@ configure_file(
|
||||||
input: 'EolianHelper.cmake.in',
|
input: 'EolianHelper.cmake.in',
|
||||||
output: 'EolianHelper.cmake',
|
output: 'EolianHelper.cmake',
|
||||||
install_dir: join_paths(dir_lib, 'cmake', 'Eolian'),
|
install_dir: join_paths(dir_lib, 'cmake', 'Eolian'),
|
||||||
copy: true
|
configuration : conf
|
||||||
)
|
)
|
|
@ -11,8 +11,14 @@ endif
|
||||||
org_enlightenment_ethumb_service_config.set('systemd_dbus_prefix',
|
org_enlightenment_ethumb_service_config.set('systemd_dbus_prefix',
|
||||||
systemd_dbus_prefix)
|
systemd_dbus_prefix)
|
||||||
|
|
||||||
|
if meson.version().version_compare('>=0.58')
|
||||||
|
session_bus_services_dir = dep.get_variable('session_bus_services_dir')
|
||||||
|
else
|
||||||
|
session_bus_services_dir = dep.get_pkgconfig_variable('session_bus_services_dir')
|
||||||
|
endif
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'org.enlightenment.Ethumb.service.in',
|
input: 'org.enlightenment.Ethumb.service.in',
|
||||||
output: 'org.enlightenment.Ethumb.service',
|
output: 'org.enlightenment.Ethumb.service',
|
||||||
configuration: org_enlightenment_ethumb_service_config,
|
configuration: org_enlightenment_ethumb_service_config,
|
||||||
install_dir: dep.get_pkgconfig_variable('session_bus_services_dir'))
|
install_dir: session_bus_services_dir)
|
||||||
|
|
|
@ -109,12 +109,12 @@ foreach text_filter_property : text_filter_properties
|
||||||
font = text_filter_property[1]
|
font = text_filter_property[1]
|
||||||
size = text_filter_property[2]
|
size = text_filter_property[2]
|
||||||
name = text_filter_property[3]
|
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', join_paths(source_root, 'src', 'examples', 'evas', 'filters', 'filter_'+name+'.lua'), check: false)
|
||||||
|
|
||||||
doc_target += custom_target('preview_text_filters_'+name,
|
doc_target += custom_target('preview_text_filters_'+name,
|
||||||
command: [
|
command: [
|
||||||
env, 'EFL_RUN_IN_TREE=1',
|
env, 'EFL_RUN_IN_TREE=1',
|
||||||
'EFL_EVAS_FILTER_LUA_PREFIX=' + join_paths(meson.source_root(), 'src', 'lib', 'evas'),
|
'EFL_EVAS_FILTER_LUA_PREFIX=' + join_paths(source_root, 'src', 'lib', 'evas'),
|
||||||
preview_text_filter.full_path(), text, filter_code.stdout(), '@OUTPUT@', font, size
|
preview_text_filter.full_path(), text, filter_code.stdout(), '@OUTPUT@', font, size
|
||||||
],
|
],
|
||||||
depends: preview_text_filter,
|
depends: preview_text_filter,
|
||||||
|
@ -132,7 +132,7 @@ foreach widget_preview : widget_previews
|
||||||
dependencies: elementary,
|
dependencies: elementary,
|
||||||
build_by_default: false,
|
build_by_default: false,
|
||||||
c_args : [
|
c_args : [
|
||||||
'-DPACKAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
|
'-DPACKAGE_DATA_DIR="'+join_paths(source_root, 'data', 'elementary')+'"',
|
||||||
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
||||||
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
|
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
|
||||||
'-DDOCW_DIR="'+meson.current_build_dir()+'"']
|
'-DDOCW_DIR="'+meson.current_build_dir()+'"']
|
||||||
|
@ -152,7 +152,7 @@ foreach widget_preview : widget_previews
|
||||||
|
|
||||||
widget_executable = get_variable(binary)
|
widget_executable = get_variable(binary)
|
||||||
|
|
||||||
screen_shot_dir = join_paths(meson.build_root(), 'html', 'img', 'widget', directory)
|
screen_shot_dir = join_paths(build_root, 'html', 'img', 'widget', directory)
|
||||||
|
|
||||||
create_preview = custom_target('widget_preview_'+('_'.join([directory, ss, x, y])),
|
create_preview = custom_target('widget_preview_'+('_'.join([directory, ss, x, y])),
|
||||||
command: [shot_sh, screen_shot_dir, ss, widget_executable.full_path(), x, y],
|
command: [shot_sh, screen_shot_dir, ss, widget_executable.full_path(), x, y],
|
||||||
|
@ -181,7 +181,7 @@ doc_target += custom_target('doxygen',
|
||||||
)
|
)
|
||||||
|
|
||||||
compress_target = custom_target('package_doc_tar',
|
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', build_root, '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'],
|
||||||
output: 'efl-'+meson.project_version()+'-doc.tar.xz',
|
output: 'efl-'+meson.project_version()+'-doc.tar.xz',
|
||||||
depends: [doc_target],
|
depends: [doc_target],
|
||||||
build_by_default: false
|
build_by_default: false
|
||||||
|
@ -195,8 +195,8 @@ run_target('doc',
|
||||||
doxyfile_conf = configuration_data()
|
doxyfile_conf = configuration_data()
|
||||||
doxyfile_conf.merge_from(config_h)
|
doxyfile_conf.merge_from(config_h)
|
||||||
doxyfile_conf.set('srcdir', meson.current_source_dir())
|
doxyfile_conf.set('srcdir', meson.current_source_dir())
|
||||||
doxyfile_conf.set('top_builddir', meson.build_root())
|
doxyfile_conf.set('top_builddir', build_root)
|
||||||
doxyfile_conf.set('top_srcdir', meson.source_root())
|
doxyfile_conf.set('top_srcdir', source_root)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
input: 'Doxyfile.in',
|
input: 'Doxyfile.in',
|
||||||
|
|
|
@ -80,7 +80,7 @@ function_checks = [
|
||||||
['dirfd', ['dirent.h sys/types.h']],
|
['dirfd', ['dirent.h sys/types.h']],
|
||||||
['fchmod', ['sys/stat.h']],
|
['fchmod', ['sys/stat.h']],
|
||||||
['fcntl', ['fcntl.h']],
|
['fcntl', ['fcntl.h']],
|
||||||
['fork', ['unistd.h']],
|
# ['fork', ['unistd.h']],
|
||||||
['fpathconf', ['unistd.h']],
|
['fpathconf', ['unistd.h']],
|
||||||
['geteuid', ['unistd.h']],
|
['geteuid', ['unistd.h']],
|
||||||
['getpagesize', ['unistd.h']],
|
['getpagesize', ['unistd.h']],
|
||||||
|
|
41
meson.build
41
meson.build
|
@ -4,6 +4,14 @@ project('efl', ['c','cpp'],
|
||||||
meson_version : '>=0.50'
|
meson_version : '>=0.50'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
if host_machine.system() == 'darwin'
|
if host_machine.system() == 'darwin'
|
||||||
add_languages('objc')
|
add_languages('objc')
|
||||||
endif
|
endif
|
||||||
|
@ -141,7 +149,7 @@ config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project
|
||||||
config_h.set_quoted('PACKAGE_NAME', meson.project_name())
|
config_h.set_quoted('PACKAGE_NAME', meson.project_name())
|
||||||
config_h.set_quoted('PACKAGE_BIN_DIR', dir_bin)
|
config_h.set_quoted('PACKAGE_BIN_DIR', dir_bin)
|
||||||
config_h.set_quoted('PACKAGE_LIB_DIR', dir_lib)
|
config_h.set_quoted('PACKAGE_LIB_DIR', dir_lib)
|
||||||
config_h.set_quoted('PACKAGE_SRC_DIR', meson.source_root())
|
config_h.set_quoted('PACKAGE_SRC_DIR', source_root)
|
||||||
config_h.set_quoted('PACKAGE_BUILD_DIR', meson.current_build_dir())
|
config_h.set_quoted('PACKAGE_BUILD_DIR', meson.current_build_dir())
|
||||||
config_h.set_quoted('PACKAGE_SYSCONF_DIR', dir_sysconf)
|
config_h.set_quoted('PACKAGE_SYSCONF_DIR', dir_sysconf)
|
||||||
config_h.set_quoted('BINDIR', dir_bin)
|
config_h.set_quoted('BINDIR', dir_bin)
|
||||||
|
@ -298,9 +306,18 @@ if sys_osx and get_option('lua-interpreter') == 'luajit'
|
||||||
# luajit on macro is broken, this means we need to generate our own
|
# luajit on macro is broken, this means we need to generate our own
|
||||||
# dependency with our arguments, a library later still needs to link to
|
# dependency with our arguments, a library later still needs to link to
|
||||||
# luajit for the pagesize argument thingy
|
# luajit for the pagesize argument thingy
|
||||||
|
if meson.version().version_compare('>=0.58')
|
||||||
|
lua_inc_dir = lua.get_variable('includedir')
|
||||||
|
lua_lib_dir = lua.get_variable('libdir')
|
||||||
|
lua_lib_name = lua.get_variable('libname')
|
||||||
|
else
|
||||||
|
lua_inc_dir = lua.get_pkgconfig_variable('includedir')
|
||||||
|
lua_lib_dir = lua.get_pkgconfig_variable('libdir')
|
||||||
|
lua_lib_name = lua.get_pkgconfig_variable('libname')
|
||||||
|
endif
|
||||||
lua = declare_dependency(
|
lua = declare_dependency(
|
||||||
include_directories: include_directories(lua.get_pkgconfig_variable('includedir')),
|
include_directories: include_directories(lua_inc_dir),
|
||||||
link_args: ['-L' + lua.get_pkgconfig_variable('libdir'), '-l' + lua.get_pkgconfig_variable('libname')]
|
link_args: ['-L' + lua_lib_dir, '-l' + lua_lib_name]
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -487,15 +504,15 @@ foreach package : subprojects
|
||||||
requires : package[9],
|
requires : package[9],
|
||||||
variables : package_pc_variables
|
variables : package_pc_variables
|
||||||
)
|
)
|
||||||
if package_name == 'ethumb_client'
|
# if package_name == 'ethumb_client'
|
||||||
pkgconfig.generate(tmp_lib,
|
# pkgconfig.generate(tmp_lib,
|
||||||
name : package_name,
|
# name : package_name,
|
||||||
subdirs : [package_version_name] + tmp_package_subdirs,
|
# subdirs : [package_version_name] + tmp_package_subdirs,
|
||||||
version : version_major + '.' + version_minor + '.' + version_micro,
|
# version : version_major + '.' + version_minor + '.' + version_micro,
|
||||||
libraries : tmp_pub_deps,
|
# libraries : tmp_pub_deps,
|
||||||
requires : package[9],
|
# requires : package[9],
|
||||||
)
|
# )
|
||||||
endif
|
# endif
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
message(package_name+' disabled!')
|
message(package_name+' disabled!')
|
||||||
|
|
|
@ -14,5 +14,5 @@ eo_bench = executable('eo_bench',
|
||||||
)
|
)
|
||||||
|
|
||||||
benchmark('eo', eo_bench,
|
benchmark('eo', eo_bench,
|
||||||
args: run_command('date','+%F_%s').stdout()
|
args: run_command('date','+%F_%s', check: false).stdout()
|
||||||
)
|
)
|
||||||
|
|
|
@ -38,7 +38,12 @@ endif
|
||||||
|
|
||||||
if meson.is_cross_build()
|
if meson.is_cross_build()
|
||||||
_edje_cc = find_program('edje_cc', native: true)
|
_edje_cc = find_program('edje_cc', native: true)
|
||||||
edje_cc_path = _edje_cc.path()
|
if meson.version().version_compare('>=0.55')
|
||||||
|
edje_cc_path = _edje_cc.full_path()
|
||||||
|
else
|
||||||
|
edje_cc_path = _edje_cc.path()
|
||||||
|
endif
|
||||||
|
|
||||||
edje_cc_exe = [_edje_cc]
|
edje_cc_exe = [_edje_cc]
|
||||||
edje_depends = []
|
edje_depends = []
|
||||||
else
|
else
|
||||||
|
@ -94,7 +99,11 @@ edje_codegen = executable('edje_codegen',
|
||||||
|
|
||||||
if meson.is_cross_build()
|
if meson.is_cross_build()
|
||||||
_edje_codegen = find_program('edje_codegen', native: true)
|
_edje_codegen = find_program('edje_codegen', native: true)
|
||||||
edje_codegen_path = _edje_codegen.path()
|
if meson.version().version_compare('>=0.55')
|
||||||
|
edje_codegen_path = _edje_codegen.full_path()
|
||||||
|
else
|
||||||
|
edje_codegen_path = _edje_codegen.path()
|
||||||
|
endif
|
||||||
edje_codegen_exe = [_edje_codegen]
|
edje_codegen_exe = [_edje_codegen]
|
||||||
else
|
else
|
||||||
edje_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_codegen]
|
edje_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_codegen]
|
||||||
|
|
|
@ -255,7 +255,11 @@ elm_prefs_cc = executable('elm_prefs_cc',
|
||||||
|
|
||||||
if meson.is_cross_build()
|
if meson.is_cross_build()
|
||||||
_elm_prefs_cc = find_program('elm_prefs_cc', native: true)
|
_elm_prefs_cc = find_program('elm_prefs_cc', native: true)
|
||||||
elm_prefs_cc_path = _elm_prefs_cc.path()
|
if meson.version().version_compare('>=0.55')
|
||||||
|
elm_prefs_cc_path = _elm_prefs_cc.full_path()
|
||||||
|
else
|
||||||
|
elm_prefs_cc_path = _elm_prefs_cc.path()
|
||||||
|
endif
|
||||||
elm_prefs_cc_exe = [_elm_prefs_cc]
|
elm_prefs_cc_exe = [_elm_prefs_cc]
|
||||||
else
|
else
|
||||||
elm_prefs_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elm_prefs_cc.full_path()]
|
elm_prefs_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elm_prefs_cc.full_path()]
|
||||||
|
|
|
@ -25,8 +25,8 @@ edjs = custom_target('player_entry',
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : 'share/exactness',
|
install_dir : 'share/exactness',
|
||||||
command : edje_cc_exe + [
|
command : edje_cc_exe + [
|
||||||
'-id', join_paths(meson.source_root(), 'data', 'elementary', 'themes', 'img'),
|
'-id', join_paths(source_root, 'data', 'elementary', 'themes', 'img'),
|
||||||
'-sd', join_paths(meson.source_root(), 'data', 'elementary', 'themes', 'snd'),
|
'-sd', join_paths(source_root, 'data', 'elementary', 'themes', 'snd'),
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_depends)
|
depends : edje_depends)
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ mono_files += files(
|
||||||
|
|
||||||
bash = find_program('bash')
|
bash = find_program('bash')
|
||||||
|
|
||||||
map = run_command('map_generate.sh').stdout()
|
map = run_command('map_generate.sh', check: false).stdout()
|
||||||
|
|
||||||
|
|
||||||
efl_libs = configuration_data()
|
efl_libs = configuration_data()
|
||||||
|
|
|
@ -243,7 +243,7 @@ if (get_option('dotnet'))
|
||||||
|
|
||||||
lib_csproj_conf_data.set('NETSTANDARD_VERSION', dotnet_standard_version)
|
lib_csproj_conf_data.set('NETSTANDARD_VERSION', dotnet_standard_version)
|
||||||
lib_csproj_conf_data.set('BINDING_SRC', meson.current_source_dir())
|
lib_csproj_conf_data.set('BINDING_SRC', meson.current_source_dir())
|
||||||
lib_csproj_conf_data.set('CA_RULESET', join_paths(meson.build_root(), '@0@'.format(ca_ruleset)))
|
lib_csproj_conf_data.set('CA_RULESET', join_paths(build_root, '@0@'.format(ca_ruleset)))
|
||||||
lib_csproj_conf_data.set('EFL_VERSION', meson.project_version())
|
lib_csproj_conf_data.set('EFL_VERSION', meson.project_version())
|
||||||
|
|
||||||
if get_option('mono-beta')
|
if get_option('mono-beta')
|
||||||
|
@ -299,7 +299,7 @@ else
|
||||||
cs_args : extra_cs_args + ['-doc:' + efl_mono_xml_doc, '-warnaserror+'],
|
cs_args : extra_cs_args + ['-doc:' + efl_mono_xml_doc, '-warnaserror+'],
|
||||||
)
|
)
|
||||||
|
|
||||||
meson.add_install_script(join_paths(meson.source_root(), 'meson', 'meson_csharp_docs.sh'),
|
meson.add_install_script(join_paths(source_root, 'meson', 'meson_csharp_docs.sh'),
|
||||||
efl_mono_xml_doc,
|
efl_mono_xml_doc,
|
||||||
efl_mono_install_dir)
|
efl_mono_install_dir)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -73,7 +73,11 @@ foreach option : options_to_check
|
||||||
endif
|
endif
|
||||||
prog = find_program(_option, required: false)
|
prog = find_program(_option, required: false)
|
||||||
if prog.found()
|
if prog.found()
|
||||||
set_variable(option+'_bin', prog.path())
|
if meson.version().version_compare('>=0.55')
|
||||||
|
set_variable(option+'_bin', prog.full_path())
|
||||||
|
else
|
||||||
|
set_variable(option+'_bin', prog.path())
|
||||||
|
endif
|
||||||
else
|
else
|
||||||
set_variable(option+'_bin', '')
|
set_variable(option+'_bin', '')
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
eolian_include_directories += ['-I', join_paths(meson.source_root(), 'src', 'lib')]
|
eolian_include_directories += ['-I', join_paths(source_root, 'src', 'lib')]
|
||||||
|
|
||||||
pub_legacy_eo_files = [
|
pub_legacy_eo_files = [
|
||||||
'efl_gfx_fill.eo',
|
'efl_gfx_fill.eo',
|
||||||
|
|
|
@ -78,18 +78,18 @@ deprecated_efreet_trash_lib = library('efreet_trash',
|
||||||
install: true,
|
install: true,
|
||||||
version : meson.project_version()
|
version : meson.project_version()
|
||||||
)
|
)
|
||||||
pkgconfig.generate(efreet_lib,
|
# pkgconfig.generate(efreet_lib,
|
||||||
name : 'efreet-mime',
|
# name : 'efreet-mime',
|
||||||
description : 'Deprecated, please just use efreet',
|
# description : 'Deprecated, please just use efreet',
|
||||||
subdirs : package_version_name,
|
# subdirs : package_version_name,
|
||||||
version : version_major + '.' + version_minor + '.' + version_micro,
|
# version : version_major + '.' + version_minor + '.' + version_micro,
|
||||||
libraries : efreet_pub_deps,
|
# libraries : efreet_pub_deps,
|
||||||
)
|
# )
|
||||||
|
|
||||||
pkgconfig.generate(efreet_lib,
|
# pkgconfig.generate(efreet_lib,
|
||||||
name : 'efreet-trash',
|
# name : 'efreet-trash',
|
||||||
description : 'Deprecated, please just use efreet',
|
# description : 'Deprecated, please just use efreet',
|
||||||
subdirs : package_version_name,
|
# subdirs : package_version_name,
|
||||||
version : version_major + '.' + version_minor + '.' + version_micro,
|
# version : version_major + '.' + version_minor + '.' + version_micro,
|
||||||
libraries : efreet_pub_deps,
|
# libraries : efreet_pub_deps,
|
||||||
)
|
# )
|
||||||
|
|
|
@ -235,9 +235,8 @@ elif get_option('buildtype') == 'release'
|
||||||
want_cow_magic=false
|
want_cow_magic=false
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if with_max_log_level != -1
|
# config_h.set('EINA_LOG_LEVEL_MAXIMUM', 3)
|
||||||
config_h.set('EINA_LOG_LEVEL_MAXIMUM', with_max_log_level)
|
config_h.set('EINA_LOG_LEVEL', 1)
|
||||||
endif
|
|
||||||
|
|
||||||
if stringshare_usage
|
if stringshare_usage
|
||||||
config_h.set('EINA_STRINGSHARE_USAGE', 1)
|
config_h.set('EINA_STRINGSHARE_USAGE', 1)
|
||||||
|
@ -362,7 +361,11 @@ if unwind.found()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#for the case that the iconv library is not part of libc but rather libiconv or smth. like that
|
#for the case that the iconv library is not part of libc but rather libiconv or smth. like that
|
||||||
iconv = dependency('iconv', required: false)
|
if meson.version().version_compare('>=0.60')
|
||||||
|
iconv = dependency('iconv', method: 'auto')
|
||||||
|
else
|
||||||
|
iconv = dependency('iconv', required: false)
|
||||||
|
endif
|
||||||
if iconv.found() == false
|
if iconv.found() == false
|
||||||
iconv = cc.find_library('iconv', required: false)
|
iconv = cc.find_library('iconv', required: false)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -261,7 +261,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
|
||||||
embed_script = find_program('config_embed')
|
embed_script = find_program('config_embed')
|
||||||
|
|
||||||
embed_config = custom_target('create_embedded_default_config',
|
embed_config = custom_target('create_embedded_default_config',
|
||||||
input: join_paths(meson.source_root(), 'data', 'elementary', 'config', 'standard', 'base.src.in'),
|
input: join_paths(source_root, 'data', 'elementary', 'config', 'standard', 'base.src.in'),
|
||||||
output: 'elm_default_config.x',
|
output: 'elm_default_config.x',
|
||||||
command: [embed_script, '@INPUT@', '@OUTPUT@']
|
command: [embed_script, '@INPUT@', '@OUTPUT@']
|
||||||
)
|
)
|
||||||
|
@ -955,7 +955,7 @@ elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_inp
|
||||||
elementary_ext_deps = [atspi, dl, intl, buildsystem_simple]
|
elementary_ext_deps = [atspi, dl, intl, buildsystem_simple]
|
||||||
elm_options = configuration_data()
|
elm_options = configuration_data()
|
||||||
|
|
||||||
config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root())
|
config_h.set_quoted('ELM_TOP_BUILD_DIR', build_root)
|
||||||
config_h.set_quoted('MODULES_PATH', join_paths(dir_lib, 'modules'))
|
config_h.set_quoted('MODULES_PATH', join_paths(dir_lib, 'modules'))
|
||||||
config_h.set_quoted('ELEMENTARY_BASE_DIR', get_option('elementary-base-dir'))
|
config_h.set_quoted('ELEMENTARY_BASE_DIR', get_option('elementary-base-dir'))
|
||||||
config_h.set_quoted('ICON_DIR', join_paths(dir_lib, 'icons'))
|
config_h.set_quoted('ICON_DIR', join_paths(dir_lib, 'icons'))
|
||||||
|
|
|
@ -239,7 +239,7 @@ foreach loader_inst : evas_image_loaders_file
|
||||||
if get_option('evas-loaders-disabler').contains(loader) == false
|
if get_option('evas-loaders-disabler').contains(loader) == false
|
||||||
if loader_type == 'static'
|
if loader_type == 'static'
|
||||||
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
|
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
|
||||||
file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
|
file = join_paths(source_root, 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
|
||||||
config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
|
config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
|
||||||
evas_static_list += [declare_dependency(
|
evas_static_list += [declare_dependency(
|
||||||
sources: file,
|
sources: file,
|
||||||
|
@ -258,7 +258,7 @@ foreach loader_inst : evas_image_savers_file
|
||||||
if get_option('evas-loaders-disabler').contains(loader) == false
|
if get_option('evas-loaders-disabler').contains(loader) == false
|
||||||
if loader_type == 'static'
|
if loader_type == 'static'
|
||||||
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
|
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
|
||||||
file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
|
file = join_paths(source_root, 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
|
||||||
config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
|
config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
|
||||||
evas_static_list += [declare_dependency(
|
evas_static_list += [declare_dependency(
|
||||||
sources: file,
|
sources: file,
|
||||||
|
@ -275,7 +275,7 @@ foreach loader_inst : evas_vg_loaders_file
|
||||||
loader_deps = loader_inst[1]
|
loader_deps = loader_inst[1]
|
||||||
|
|
||||||
if (get_option('evas-loaders-disabler').contains(loader) == false)
|
if (get_option('evas-loaders-disabler').contains(loader) == false)
|
||||||
file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'vg_loaders', loader, 'evas_vg_load_'+loader+'.c')
|
file = join_paths(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,
|
sources: file,
|
||||||
dependencies: loader_deps,
|
dependencies: loader_deps,
|
||||||
|
@ -286,7 +286,7 @@ endforeach
|
||||||
|
|
||||||
foreach loader : evas_vg_savers_file
|
foreach loader : evas_vg_savers_file
|
||||||
if (get_option('evas-loaders-disabler').contains(loader) == false)
|
if (get_option('evas-loaders-disabler').contains(loader) == false)
|
||||||
file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'vg_savers', loader, 'evas_vg_save_'+loader+'.c')
|
file = join_paths(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,
|
sources: file,
|
||||||
dependencies: [eo, ector, emile, freetype, eet],
|
dependencies: [eo, ector, emile, freetype, eet],
|
||||||
|
|
|
@ -5,7 +5,7 @@ foreach loader_inst : evas_image_loaders_file
|
||||||
if get_option('evas-loaders-disabler').contains(loader) == false
|
if get_option('evas-loaders-disabler').contains(loader) == false
|
||||||
if loader_type == 'shared'
|
if loader_type == 'shared'
|
||||||
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
|
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
|
||||||
file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
|
file = join_paths(source_root, 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
|
||||||
evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
|
evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
|
||||||
mod_install_dir = join_paths(evas_package_modules, 'image_loaders', loader, version_name)
|
mod_install_dir = join_paths(evas_package_modules, 'image_loaders', loader, version_name)
|
||||||
shared_module('shared_loader_'+loader, file,
|
shared_module('shared_loader_'+loader, file,
|
||||||
|
|
|
@ -5,7 +5,7 @@ foreach loader_inst : evas_image_savers_file
|
||||||
if get_option('evas-loaders-disabler').contains(loader) == false
|
if get_option('evas-loaders-disabler').contains(loader) == false
|
||||||
if loader_type == 'shared'
|
if loader_type == 'shared'
|
||||||
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
|
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
|
||||||
file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
|
file = join_paths(source_root, 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
|
||||||
evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
|
evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
|
||||||
mod_install_dir = join_paths(evas_package_modules, 'image_savers', loader, version_name)
|
mod_install_dir = join_paths(evas_package_modules, 'image_savers', loader, version_name)
|
||||||
shared_module('shared_saver_'+loader, file,
|
shared_module('shared_saver_'+loader, file,
|
||||||
|
|
|
@ -10,7 +10,7 @@ buildsystem_lib = static_library('buildsystem',
|
||||||
dependencies : [eina, efl],
|
dependencies : [eina, efl],
|
||||||
include_directories : config_dir + [include_directories(join_paths('..', '..', 'lib'))],
|
include_directories : config_dir + [include_directories(join_paths('..', '..', 'lib'))],
|
||||||
install: false,
|
install: false,
|
||||||
c_args : ['-DPACKAGE_SRC_DIR="'+ meson.source_root() +'"'],
|
c_args : ['-DPACKAGE_SRC_DIR="'+ source_root +'"'],
|
||||||
)
|
)
|
||||||
|
|
||||||
buildsystem = declare_dependency(
|
buildsystem = declare_dependency(
|
||||||
|
|
|
@ -26,7 +26,7 @@ foreach edc_file : edc_files
|
||||||
input : edc_file,
|
input : edc_file,
|
||||||
output : '@BASENAME@.edj',
|
output : '@BASENAME@.edj',
|
||||||
command : edje_cc_exe + [ '-beta', '-fastcomp',
|
command : edje_cc_exe + [ '-beta', '-fastcomp',
|
||||||
'-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
|
'-id', join_paths(source_root, 'src', 'tests', 'emotion', 'data'),
|
||||||
'-fd', meson.current_source_dir(),
|
'-fd', meson.current_source_dir(),
|
||||||
'-sd', meson.current_source_dir(),
|
'-sd', meson.current_source_dir(),
|
||||||
'-vd', meson.current_source_dir(),
|
'-vd', meson.current_source_dir(),
|
||||||
|
|
|
@ -7,7 +7,7 @@ foreach edc_file : edc_files
|
||||||
input : edc_file,
|
input : edc_file,
|
||||||
output : '@BASENAME@.edj',
|
output : '@BASENAME@.edj',
|
||||||
command : edje_cc_exe + [ '-beta', '-fastcomp',
|
command : edje_cc_exe + [ '-beta', '-fastcomp',
|
||||||
'-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
|
'-id', join_paths(source_root, 'src', 'tests', 'emotion', 'data'),
|
||||||
'-fd', meson.current_source_dir(),
|
'-fd', meson.current_source_dir(),
|
||||||
'-sd', meson.current_source_dir(),
|
'-sd', meson.current_source_dir(),
|
||||||
'-vd', meson.current_source_dir(),
|
'-vd', meson.current_source_dir(),
|
||||||
|
|
|
@ -94,7 +94,7 @@ if get_option('dotnet')
|
||||||
dotnet_test_conf_data.set('BINDING_BUILD', join_paths(meson.current_build_dir(),
|
dotnet_test_conf_data.set('BINDING_BUILD', join_paths(meson.current_build_dir(),
|
||||||
'..', '..', 'bindings', 'mono'))
|
'..', '..', 'bindings', 'mono'))
|
||||||
dotnet_test_conf_data.set('BINDING_TEST_SRC', meson.current_source_dir())
|
dotnet_test_conf_data.set('BINDING_TEST_SRC', meson.current_source_dir())
|
||||||
dotnet_test_conf_data.set('CA_RULESET', join_paths(meson.build_root(), '@0@'.format(ca_ruleset)))
|
dotnet_test_conf_data.set('CA_RULESET', join_paths(build_root, '@0@'.format(ca_ruleset)))
|
||||||
|
|
||||||
dotnet_test_conf_data.set('NETCOREAPP_VERSION', dotnet_core_app_version)
|
dotnet_test_conf_data.set('NETCOREAPP_VERSION', dotnet_core_app_version)
|
||||||
|
|
||||||
|
|
|
@ -113,8 +113,8 @@ elementary_suite = executable('elementary_suite',
|
||||||
c_args : [
|
c_args : [
|
||||||
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
||||||
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
|
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
|
||||||
'-DELM_IMAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
|
'-DELM_IMAGE_DATA_DIR="'+join_paths(source_root, 'data', 'elementary')+'"',
|
||||||
'-DELM_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"',
|
'-DELM_TEST_DATA_DIR="'+join_paths(build_root, 'data', 'elementary')+'"',
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -177,8 +177,8 @@ efl_ui_suite = executable('efl_ui_suite',
|
||||||
c_args : [
|
c_args : [
|
||||||
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
||||||
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
|
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
|
||||||
'-DELM_IMAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
|
'-DELM_IMAGE_DATA_DIR="'+join_paths(source_root, 'data', 'elementary')+'"',
|
||||||
'-DELM_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"',
|
'-DELM_TEST_DATA_DIR="'+join_paths(build_root, 'data', 'elementary')+'"',
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -193,7 +193,8 @@ executable('efl_ui_window_cnp_dnd_slave',
|
||||||
)
|
)
|
||||||
|
|
||||||
test('elementary-suite', elementary_suite,
|
test('elementary-suite', elementary_suite,
|
||||||
env : test_env
|
env : test_env,
|
||||||
|
timeout: 60
|
||||||
)
|
)
|
||||||
|
|
||||||
test('efl-ui-suite', efl_ui_suite,
|
test('efl-ui-suite', efl_ui_suite,
|
||||||
|
@ -203,4 +204,5 @@ test('efl-ui-suite', efl_ui_suite,
|
||||||
install_data(files(['testdiff.diff', 'testfile-windows.txt', 'testfile-withblanks.txt', 'testfile.txt']),
|
install_data(files(['testdiff.diff', 'testfile-windows.txt', 'testfile-withblanks.txt', 'testfile.txt']),
|
||||||
install_dir : join_paths(dir_data, 'elementary')
|
install_dir : join_paths(dir_data, 'elementary')
|
||||||
)
|
)
|
||||||
subdir('spec')
|
|
||||||
|
# subdir('spec')
|
||||||
|
|
|
@ -38,8 +38,8 @@ efl_ui_behavior_suite = executable('efl_ui_spec_suite',
|
||||||
c_args : [
|
c_args : [
|
||||||
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
||||||
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
|
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
|
||||||
'-DELM_IMAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
|
'-DELM_IMAGE_DATA_DIR="'+join_paths(source_root, 'data', 'elementary')+'"',
|
||||||
'-DELM_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"',
|
'-DELM_TEST_DATA_DIR="'+join_paths(build_root, 'data', 'elementary')+'"',
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,10 @@ elua_suite_src = [
|
||||||
'elua_lib.c'
|
'elua_lib.c'
|
||||||
]
|
]
|
||||||
|
|
||||||
elua_bindings_dir = join_paths(meson.source_root(), 'src', 'bindings', 'lua')
|
elua_bindings_dir = join_paths(source_root, 'src', 'bindings', 'lua')
|
||||||
elua_core_dir = join_paths(meson.source_root(), 'src', 'scripts', 'elua', 'core')
|
elua_core_dir = join_paths(source_root, 'src', 'scripts', 'elua', 'core')
|
||||||
elua_modules_dir = join_paths(meson.source_root(), 'src', 'scripts', 'elua', 'modules')
|
elua_modules_dir = join_paths(source_root, 'src', 'scripts', 'elua', 'modules')
|
||||||
elua_apps_dir = join_paths(meson.source_root(), 'src', 'tests', 'elua', 'data', 'apps')
|
elua_apps_dir = join_paths(source_root, 'src', 'tests', 'elua', 'data', 'apps')
|
||||||
|
|
||||||
elua_suite = executable('elua_suite',
|
elua_suite = executable('elua_suite',
|
||||||
elua_suite_src,
|
elua_suite_src,
|
||||||
|
|
|
@ -32,7 +32,7 @@ eolian_suite = executable('eolian_suite',
|
||||||
c_args : [
|
c_args : [
|
||||||
'-DEOLIAN_GEN="'+eolian_gen_path+'"',
|
'-DEOLIAN_GEN="'+eolian_gen_path+'"',
|
||||||
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
||||||
'-DEO_SRC_DIR="'+join_paths(meson.source_root(), 'src', 'lib')+'"',
|
'-DEO_SRC_DIR="'+join_paths(source_root, 'src', 'lib')+'"',
|
||||||
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
|
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ eolian_cxx_suite = executable('eolian_cxx_suite',
|
||||||
# package_c_args contains -D definitions for the package
|
# package_c_args contains -D definitions for the package
|
||||||
cpp_args : package_c_args +[
|
cpp_args : package_c_args +[
|
||||||
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
|
||||||
'-DEO_SRC_DIR="'+join_paths(meson.source_root(), 'src', 'lib')+'"',
|
'-DEO_SRC_DIR="'+join_paths(source_root, 'src', 'lib')+'"',
|
||||||
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
|
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -20,15 +20,21 @@ wl_stable_protocol_sys = [
|
||||||
join_paths('xdg-shell', 'xdg-shell.xml'),
|
join_paths('xdg-shell', 'xdg-shell.xml'),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if meson.version().version_compare('>=0.58')
|
||||||
|
wl_pkg_data_dir = _wayland_protocols.get_variable('pkgdatadir')
|
||||||
|
else
|
||||||
|
wl_pkg_data_dir = _wayland_protocols.get_pkgconfig_variable('pkgdatadir')
|
||||||
|
endif
|
||||||
|
|
||||||
foreach sys_protocol : wl_unstable_protocol_sys
|
foreach sys_protocol : wl_unstable_protocol_sys
|
||||||
wl_protocol_local += [
|
wl_protocol_local += [
|
||||||
join_paths(_wayland_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable',
|
join_paths(wl_pkg_data_dir, 'unstable',
|
||||||
sys_protocol)]
|
sys_protocol)]
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
foreach sys_protocol : wl_stable_protocol_sys
|
foreach sys_protocol : wl_stable_protocol_sys
|
||||||
wl_protocol_local += [
|
wl_protocol_local += [
|
||||||
join_paths(_wayland_protocols.get_pkgconfig_variable('pkgdatadir'), 'stable',
|
join_paths(wl_pkg_data_dir, 'stable',
|
||||||
sys_protocol)]
|
sys_protocol)]
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,12 @@
|
||||||
if get_option('systemd') == true
|
if get_option('systemd') == true
|
||||||
sys_dep = dependency('systemd', required: false)
|
sys_dep = dependency('systemd', required: false)
|
||||||
if sys_dep.found()
|
if sys_dep.found()
|
||||||
sys_dir = sys_dep.get_pkgconfig_variable('systemduserunitdir')
|
if meson.version().version_compare('>=0.58')
|
||||||
|
sys_unit_dir = sys_dep.get_variable('systemduserunitdir')
|
||||||
|
else
|
||||||
|
sys_unit_dir = sys_dep.get_pkgconfig_variable('systemduserunitdir')
|
||||||
|
endif
|
||||||
|
sys_dir = sys_unit_dir
|
||||||
else
|
else
|
||||||
sys_dir = join_paths(dir_lib, 'systemd', 'user')
|
sys_dir = join_paths(dir_lib, 'systemd', 'user')
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue