kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build - remove evas-modules option as its rather pointless 

evas-modules affects evas engine modules if they are static or shared,
but ecore evas modules are still modules... so all in all this doesnt
help much as it still requires modules to be separate from the shared
libs, thus disallowing for statically linking efl into an app anyway
etc. etc. etc. ... so less options to deal with, less complexity.
better.
This commit is contained in:
Carsten Haitzler 2019-10-04 13:16:02 +01:00
parent 15696f5e7c
commit 6d8e39a642
16 changed files with 100 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/ci-configure.sh
View File

@ -25,7 +25,7 @@ if [ "$DISTRO" != "" ] ; then
DISABLED_LINUX_COPTS=" -Daudio=false -Davahi=false -Dx11=false -Dphysics=false -Deeze=false \ DISABLED_LINUX_COPTS=" -Daudio=false -Davahi=false -Dx11=false -Dphysics=false -Deeze=false \
-Dopengl=none -Deina-magic-debug=false -Dbuild-examples=false -Dbuild-tests=false \ -Dopengl=none -Deina-magic-debug=false -Dbuild-examples=false -Dbuild-tests=false \
-Dcrypto=gnutls -Dglib=false -Dgstreamer=false -Dsystemd=false -Dpulseaudio=false \ -Dcrypto=gnutls -Dglib=false -Dgstreamer=false -Dsystemd=false -Dpulseaudio=false \
-Dnetwork-backend=connman -Dxinput2=false -Dtslib=false -Devas-modules=static \ -Dnetwork-backend=connman -Dxinput2=false -Dtslib=false \
-Devas-loaders-disabler=gst,pdf,ps,raw,svg,xcf,bmp,dds,eet,generic,gif,ico,jp2k,json,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm \ -Devas-loaders-disabler=gst,pdf,ps,raw,svg,xcf,bmp,dds,eet,generic,gif,ico,jp2k,json,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm \
-Decore-imf-loaders-disabler=xim,ibus,scim -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine \ -Decore-imf-loaders-disabler=xim,ibus,scim -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine \
-Demotion-generic-loaders-disabler=vlc -Dfribidi=false -Dfontconfig=false \ -Demotion-generic-loaders-disabler=vlc -Dfribidi=false -Dfontconfig=false \
@ -37,7 +37,7 @@ if [ "$DISTRO" != "" ] ; then
MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \ MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \
-Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \ -Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \
-Devas-loaders-disabler=json,pdf,ps,raw,svg,rsvg -Devas-modules=static -Dbindings=luajit \ -Devas-loaders-disabler=json,pdf,ps,raw,svg,rsvg -Dbindings=luajit \
-Dharfbuzz=true -Dpixman=true -Dembedded-lz4=false " -Dharfbuzz=true -Dpixman=true -Dembedded-lz4=false "
if [ "$1" = "options-enabled" ]; then if [ "$1" = "options-enabled" ]; then

16
meson.build
View File

@ -252,21 +252,7 @@ evas_img_modules = ['evas' ,[], true, false, false, false
evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []] evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []]
evas_goal = ['evas_goal' ,[], false, true, false, false, false, false, ['eina', 'efl', 'eo'], []] evas_goal = ['evas_goal' ,[], false, true, false, false, false, false, ['eina', 'efl', 'eo'], []]
if get_option('evas-modules') == 'static' evas_settings = [ evas_lib, evas_img_modules, evas_goal, evas_engines ]
evas_settings = [
evas_lib,
evas_img_modules,
evas_engines,
evas_goal,
]
else
evas_settings = [
evas_lib,
evas_img_modules,
evas_goal,
evas_engines,
]
endif
subprojects = [ subprojects = [
# name | option | mod | lib | bin | bench | tests | examples | pkg-config options | name of static libs # name | option | mod | lib | bin | bench | tests | examples | pkg-config options | name of static libs

7
meson_options.txt
View File

@ -192,13 +192,6 @@ option('unmount-path',
description : 'Path to the unmount binary, if "detect" internal eeze bins are used' description : 'Path to the unmount binary, if "detect" internal eeze bins are used'
) )
option('evas-modules',
type : 'combo',
choices : ['shared', 'static'],
value : 'shared',
description : 'Should modules be shared or statically inlined'
)
option('evas-loaders-disabler', option('evas-loaders-disabler',
type : 'array', type : 'array',
description : 'List of modular image/vector loaders to disable in efl', description : 'List of modular image/vector loaders to disable in efl',

20
src/modules/evas/engines/buffer/meson.build
View File

@ -13,15 +13,11 @@ install_headers('Evas_Engine_Buffer.h',
install_dir : join_paths(dir_include, 'evas-'+version_major), install_dir : join_paths(dir_include, 'evas-'+version_major),
) )
if get_option('evas-modules') == 'shared' evas_engine_buffer_mod = shared_module(mod_full_name, engine_src,
evas_engine_buffer_mod = shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
else
evas_engine_buffer_mod = []
endif

18
src/modules/evas/engines/drm/meson.build
View File

@ -7,13 +7,11 @@ engine_src = files([
engine_deps = [ecore_drm2, libdrm] engine_deps = [ecore_drm2, libdrm]
if get_option('evas-modules') == 'shared' shared_module(mod_full_name, engine_src,
shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif

18
src/modules/evas/engines/fb/meson.build
View File

@ -9,13 +9,11 @@ engine_src = files([
engine_deps = [ecore_fb] engine_deps = [ecore_fb]
if get_option('evas-modules') == 'shared' shared_module(mod_full_name, engine_src,
shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif

18
src/modules/evas/engines/gl_cocoa/meson.build
View File

@ -7,13 +7,11 @@ engine_src = files([
engine_deps = [ecore_cocoa, gl_deps] engine_deps = [ecore_cocoa, gl_deps]
if get_option('evas-modules') == 'shared' shared_module(mod_full_name, engine_src,
shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif

18
src/modules/evas/engines/gl_drm/meson.build
View File

@ -7,13 +7,11 @@ engine_src = files([
engine_deps = [ecore_drm2, libdrm, gl_deps, dependency('gbm')] engine_deps = [ecore_drm2, libdrm, gl_deps, dependency('gbm')]
if get_option('evas-modules') == 'shared' shared_module(mod_full_name, engine_src,
shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif

18
src/modules/evas/engines/gl_generic/meson.build
View File

@ -70,13 +70,11 @@ engine_deps = [gl_deps]
engine_include_dir = include_directories(join_paths('..','software_generic'), join_paths('..', 'gl_common')) engine_include_dir = include_directories(join_paths('..','software_generic'), join_paths('..', 'gl_common'))
if get_option('evas-modules') == 'shared' shared_module(mod_full_name, engine_src,
shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif

18
src/modules/evas/engines/gl_x11/meson.build
View File

@ -7,13 +7,11 @@ engine_src = files([
engine_deps = [ecore_x_deps, gl_deps] engine_deps = [ecore_x_deps, gl_deps]
if get_option('evas-modules') == 'shared' shared_module(mod_full_name, engine_src,
shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif

22
src/modules/evas/engines/meson.build
View File

@ -62,28 +62,6 @@ foreach engine_conf : engines
subdir(engine) subdir(engine)
if get_option('evas-modules') == 'static'
tmp = static_library(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
dependencies : [eina, evas_pre] + engine_deps,
)
evas_static_list += declare_dependency(
include_directories: [include_directories('.')] + config_dir + [engine_include_dir],
link_with: tmp,
dependencies : [eina, evas_pre] + engine_deps,
sources : engine_src
)
if engine == 'gl_generic'
#special case, see evas_module.c
config_h.set('EVAS_STATIC_BUILD_GL_COMMON', '1')
else
config_h.set('EVAS_STATIC_BUILD_'+engine.to_upper(), '1')
endif
else
#nothing here shared building is handled directly on the engine configuration side
#reason for this is that the .so files have to be placed in the correct directory in order
# to make them discoverable by evas module code
endif
config_h.set('BUILD_ENGINE_'+engine.to_upper(), '1') config_h.set('BUILD_ENGINE_'+engine.to_upper(), '1')
endif endif
endforeach endforeach

20
src/modules/evas/engines/software_ddraw/meson.build
View File

@ -7,14 +7,12 @@ engine_src = files([
engine_deps = [cc.find_library('ddraw')] engine_deps = [cc.find_library('ddraw')]
if get_option('evas-modules') == 'shared' shared_module(mod_full_name, engine_src,
shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], cpp_args: ['-fno-rtti', '-fno-exceptions'],
cpp_args: ['-fno-rtti', '-fno-exceptions'], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif

18
src/modules/evas/engines/software_gdi/meson.build
View File

@ -7,13 +7,11 @@ engine_src = files([
engine_deps = [cc.find_library('gdi32')] engine_deps = [cc.find_library('gdi32')]
if get_option('evas-modules') == 'shared' shared_module(mod_full_name, engine_src,
shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif

18
src/modules/evas/engines/software_x11/meson.build
View File

@ -28,13 +28,11 @@ config_h.set('BUILD_ENGINE_SOFTWARE_XLIB', '1')
#it looks weird but is right, gl_deps is needed for evas_x_egl.c #it looks weird but is right, gl_deps is needed for evas_x_egl.c
engine_deps = [x11, ecore_x, ecore_x_deps, gl_deps] engine_deps = [x11, ecore_x, ecore_x_deps, gl_deps]
if get_option('evas-modules') == 'shared' shared_module(mod_full_name, engine_src,
shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif

19
src/modules/evas/engines/wayland_egl/meson.build
View File

@ -8,14 +8,11 @@ engine_deps = [ecore_wl2, dependency('wayland-egl'), gl_deps]
engine_include_dir = include_directories(join_paths('..','wayland_common')) engine_include_dir = include_directories(join_paths('..','wayland_common'))
shared_module(mod_full_name, engine_src,
if get_option('evas-modules') == 'shared' include_directories : config_dir + [engine_include_dir],
shared_module(mod_full_name, engine_src, dependencies : [eina, evas] + engine_deps,
include_directories : config_dir + [engine_include_dir], install : true,
dependencies : [eina, evas] + engine_deps, install_dir : mod_install_dir,
install : true, name_suffix : sys_mod_extension
install_dir : mod_install_dir, )
name_suffix : sys_mod_extension module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif

18
src/modules/evas/engines/wayland_shm/meson.build
View File

@ -8,13 +8,11 @@ engine_deps = [ecore_wl2]
engine_include_dir = include_directories(join_paths('..','wayland_common')) engine_include_dir = include_directories(join_paths('..','wayland_common'))
if get_option('evas-modules') == 'shared' shared_module(mod_full_name, engine_src,
shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir],
include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps,
dependencies : [eina, evas] + engine_deps, install : true,
install : true, install_dir : mod_install_dir,
install_dir : mod_install_dir, name_suffix : sys_mod_extension
name_suffix : sys_mod_extension )
) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif