summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-06-04 21:11:20 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-06-20 17:29:35 +0200
commitb9756eef9b821764e31ecfd32a482ceba6fcfd5b (patch)
tree2ce155a425f77e68926e11e282100f2363726623
parentb0c29edd7853abd893559d84a29b89a7bd201e50 (diff)
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>
-rw-r--r--meson.build44
-rw-r--r--meson_options.txt6
2 files changed, 16 insertions, 34 deletions
diff --git a/meson.build b/meson.build
index 04ed2a20f8..96b33180ed 100644
--- a/meson.build
+++ b/meson.build
@@ -243,12 +243,6 @@ endif
243 243
244ecore_evas_wayland_engine_include_dir = [] 244ecore_evas_wayland_engine_include_dir = []
245 245
246boot_strap_eolian = [
247 ['evil' ,[] , false, true, false, false, false, false, [], []],
248 ['eina' ,[] , false, true, false, false, false, false, [], []],
249 ['eolian' ,[] , false, true, true, false, false, false, ['eina'], []],
250]
251
252evas_lib = ['evas' ,[], false, true, false, false, true, true, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']] 246evas_lib = ['evas' ,[], false, true, false, false, true, true, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
253evas_img_modules = ['evas' ,[], true, false, false, false, false, false, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']] 247evas_img_modules = ['evas' ,[], true, false, false, false, false, false, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']]
254evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []] 248evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []]
@@ -331,10 +325,6 @@ test_dirs = []
331example_dirs = [] 325example_dirs = []
332tmp_empty = declare_dependency() 326tmp_empty = declare_dependency()
333 327
334if get_option('eolian-bootstrap')
335 subprojects = boot_strap_eolian
336endif
337
338foreach package : subprojects 328foreach package : subprojects
339 package_name = package[0] 329 package_name = package[0]
340 package_version_name = '-'.join(package_name.split('_')) + '-' + version_major 330 package_version_name = '-'.join(package_name.split('_')) + '-' + version_major
@@ -434,28 +424,26 @@ foreach package : subprojects
434 424
435endforeach 425endforeach
436 426
437subdir('cmakeconfig')
438#build this later, as the debug services are depending on ecore 427#build this later, as the debug services are depending on ecore
439if get_option('eolian-bootstrap') == false 428subdir(join_paths('src', 'bin', 'efl'))
440 subdir(join_paths('src', 'bin', 'efl'))
441 429
442 subdir(join_paths('src', 'generic', 'evas')) 430subdir(join_paths('src', 'generic', 'evas'))
443 if sys_windows == false 431if sys_windows == false
444 subdir(join_paths('src', 'generic', 'emotion')) 432 subdir(join_paths('src', 'generic', 'emotion'))
445 endif 433endif
434subdir('cmakeconfig')
446 435
447 bindings = get_option('bindings') 436bindings = get_option('bindings')
448 bindings_order = ['luajit', 'cxx', 'mono'] 437bindings_order = ['luajit', 'cxx', 'mono']
449 438
450 foreach binding : bindings_order 439foreach binding : bindings_order
451 if bindings.contains(binding) 440 if bindings.contains(binding)
452 subdir(join_paths('src', 'bindings', binding)) 441 subdir(join_paths('src', 'bindings', binding))
453 endif 442 endif
454 endforeach 443endforeach
455 444
456 subdir(join_paths('src', 'edje_external')) 445subdir(join_paths('src', 'edje_external'))
457 subdir(join_paths('data')) 446subdir(join_paths('data'))
458endif
459 447
460if get_option('build-tests') 448if get_option('build-tests')
461 check = dependency('check') 449 check = dependency('check')
@@ -484,7 +472,7 @@ endforeach
484 472
485doxygen = find_program('doxygen', required : false) 473doxygen = find_program('doxygen', required : false)
486 474
487if get_option('eolian-bootstrap') == false and doxygen.found() 475if doxygen.found()
488 subdir('doc') 476 subdir('doc')
489endif 477endif
490 478
diff --git a/meson_options.txt b/meson_options.txt
index 0b6b0bb917..79081a71bc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -367,12 +367,6 @@ option('elementary-base-dir',
367 description : 'Put the name of a base directory for elementary data' 367 description : 'Put the name of a base directory for elementary data'
368) 368)
369 369
370option('eolian-bootstrap',
371 type : 'boolean',
372 value : false,
373 description : 'Only build efl up to eolian_gen and install eina libeolian and eolian_gen, usefull for cross compiles'
374)
375
376option('install-eo-files', 370option('install-eo-files',
377 type: 'boolean', 371 type: 'boolean',
378 value: false, 372 value: false,