forked from enlightenment/efl
build: remove no longer needed eolian-bootstrap target
This basically reverts ac606105
. It was added to help the windows cross
builds on our CI. It served a purpose but with the requirements on
native eet, edje_cc and up to elm_prefs_cc we end up with a full native
build of EFL in most cases anyway.
A full meson build of EFL with examples, bindings and tests disabled is
actually quite fast and makes sure we have the latest needed on the CI
for the cross build. I switched over to this a week ago, so we can get
rid of this extra target to maintain.
Differential Revision: https://phab.enlightenment.org/D9086
Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com>
This commit is contained in:
parent
b0c29edd78
commit
b9756eef9b
16
meson.build
16
meson.build
|
@ -243,12 +243,6 @@ endif
|
||||||
|
|
||||||
ecore_evas_wayland_engine_include_dir = []
|
ecore_evas_wayland_engine_include_dir = []
|
||||||
|
|
||||||
boot_strap_eolian = [
|
|
||||||
['evil' ,[] , false, true, false, false, false, false, [], []],
|
|
||||||
['eina' ,[] , false, true, false, false, false, false, [], []],
|
|
||||||
['eolian' ,[] , false, true, true, false, false, false, ['eina'], []],
|
|
||||||
]
|
|
||||||
|
|
||||||
evas_lib = ['evas' ,[], false, true, false, false, true, true, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
|
evas_lib = ['evas' ,[], false, true, false, false, true, true, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
|
||||||
evas_img_modules = ['evas' ,[], true, false, false, false, false, false, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
|
evas_img_modules = ['evas' ,[], true, false, false, false, false, false, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
|
||||||
evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []]
|
evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []]
|
||||||
|
@ -331,10 +325,6 @@ test_dirs = []
|
||||||
example_dirs = []
|
example_dirs = []
|
||||||
tmp_empty = declare_dependency()
|
tmp_empty = declare_dependency()
|
||||||
|
|
||||||
if get_option('eolian-bootstrap')
|
|
||||||
subprojects = boot_strap_eolian
|
|
||||||
endif
|
|
||||||
|
|
||||||
foreach package : subprojects
|
foreach package : subprojects
|
||||||
package_name = package[0]
|
package_name = package[0]
|
||||||
package_version_name = '-'.join(package_name.split('_')) + '-' + version_major
|
package_version_name = '-'.join(package_name.split('_')) + '-' + version_major
|
||||||
|
@ -434,15 +424,14 @@ foreach package : subprojects
|
||||||
|
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
subdir('cmakeconfig')
|
|
||||||
#build this later, as the debug services are depending on ecore
|
#build this later, as the debug services are depending on ecore
|
||||||
if get_option('eolian-bootstrap') == false
|
|
||||||
subdir(join_paths('src', 'bin', 'efl'))
|
subdir(join_paths('src', 'bin', 'efl'))
|
||||||
|
|
||||||
subdir(join_paths('src', 'generic', 'evas'))
|
subdir(join_paths('src', 'generic', 'evas'))
|
||||||
if sys_windows == false
|
if sys_windows == false
|
||||||
subdir(join_paths('src', 'generic', 'emotion'))
|
subdir(join_paths('src', 'generic', 'emotion'))
|
||||||
endif
|
endif
|
||||||
|
subdir('cmakeconfig')
|
||||||
|
|
||||||
bindings = get_option('bindings')
|
bindings = get_option('bindings')
|
||||||
bindings_order = ['luajit', 'cxx', 'mono']
|
bindings_order = ['luajit', 'cxx', 'mono']
|
||||||
|
@ -455,7 +444,6 @@ if get_option('eolian-bootstrap') == false
|
||||||
|
|
||||||
subdir(join_paths('src', 'edje_external'))
|
subdir(join_paths('src', 'edje_external'))
|
||||||
subdir(join_paths('data'))
|
subdir(join_paths('data'))
|
||||||
endif
|
|
||||||
|
|
||||||
if get_option('build-tests')
|
if get_option('build-tests')
|
||||||
check = dependency('check')
|
check = dependency('check')
|
||||||
|
@ -484,7 +472,7 @@ endforeach
|
||||||
|
|
||||||
doxygen = find_program('doxygen', required : false)
|
doxygen = find_program('doxygen', required : false)
|
||||||
|
|
||||||
if get_option('eolian-bootstrap') == false and doxygen.found()
|
if doxygen.found()
|
||||||
subdir('doc')
|
subdir('doc')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -367,12 +367,6 @@ option('elementary-base-dir',
|
||||||
description : 'Put the name of a base directory for elementary data'
|
description : 'Put the name of a base directory for elementary data'
|
||||||
)
|
)
|
||||||
|
|
||||||
option('eolian-bootstrap',
|
|
||||||
type : 'boolean',
|
|
||||||
value : false,
|
|
||||||
description : 'Only build efl up to eolian_gen and install eina libeolian and eolian_gen, usefull for cross compiles'
|
|
||||||
)
|
|
||||||
|
|
||||||
option('install-eo-files',
|
option('install-eo-files',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
value: false,
|
value: false,
|
||||||
|
|
Loading…
Reference in New Issue