2020-05-10 05:41:57 -07:00
|
|
|
ecore_deps = []
|
2018-08-12 06:26:29 -07:00
|
|
|
ecore_pub_deps = [eina, eo, efl]
|
2020-05-10 05:41:57 -07:00
|
|
|
ecore_ext_deps = [intl, m, buildsystem]
|
2018-08-12 06:26:29 -07:00
|
|
|
|
2020-06-18 06:35:46 -07:00
|
|
|
if sys_sun == true
|
|
|
|
ecore_deps += [malloc]
|
|
|
|
endif
|
|
|
|
|
2018-08-12 06:26:29 -07:00
|
|
|
pub_legacy_eo_files = [
|
|
|
|
'ecore_event_message.eo',
|
|
|
|
'ecore_event_message_handler.eo',
|
|
|
|
]
|
|
|
|
|
|
|
|
pub_eo_file_target = []
|
|
|
|
foreach eo_file : pub_legacy_eo_files
|
|
|
|
pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
|
|
|
|
input : eo_file,
|
2018-10-21 06:55:51 -07:00
|
|
|
output : [eo_file + '.h'],
|
|
|
|
depfile : eo_file + '.d',
|
2018-08-12 06:26:29 -07:00
|
|
|
install : true,
|
|
|
|
install_dir : dir_package_include,
|
2018-12-03 09:49:47 -08:00
|
|
|
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
|
2018-08-12 06:26:29 -07:00
|
|
|
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
|
|
|
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
2018-10-21 06:55:51 -07:00
|
|
|
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
2020-09-20 06:23:26 -07:00
|
|
|
'-e', 'ECORE_API',
|
2018-10-21 06:55:51 -07:00
|
|
|
'-gchd', '@INPUT@'])
|
2018-08-12 06:26:29 -07:00
|
|
|
endforeach
|
|
|
|
|
|
|
|
pub_eo_files = [
|
|
|
|
'efl_app.eo',
|
|
|
|
'efl_loop.eo',
|
|
|
|
'efl_loop_consumer.eo',
|
|
|
|
'efl_loop_fd.eo',
|
|
|
|
'efl_loop_handler.eo',
|
|
|
|
'efl_loop_message.eo',
|
|
|
|
'efl_loop_message_handler.eo',
|
|
|
|
'efl_exe.eo',
|
|
|
|
'efl_thread.eo',
|
|
|
|
'efl_threadio.eo',
|
|
|
|
'efl_appthread.eo',
|
|
|
|
'efl_task.eo',
|
|
|
|
'efl_io_closer_fd.eo',
|
|
|
|
'efl_io_positioner_fd.eo',
|
|
|
|
'efl_io_reader_fd.eo',
|
|
|
|
'efl_io_sizer_fd.eo',
|
|
|
|
'efl_io_writer_fd.eo',
|
|
|
|
'efl_io_stdin.eo',
|
|
|
|
'efl_io_stdout.eo',
|
|
|
|
'efl_io_stderr.eo',
|
|
|
|
'efl_io_file.eo',
|
|
|
|
'efl_io_copier.eo',
|
|
|
|
'efl_io_buffered_stream.eo',
|
2018-11-23 04:26:00 -08:00
|
|
|
'efl_linear_interpolator.eo',
|
|
|
|
'efl_accelerate_interpolator.eo',
|
|
|
|
'efl_decelerate_interpolator.eo',
|
|
|
|
'efl_sinusoidal_interpolator.eo',
|
|
|
|
'efl_divisor_interpolator.eo',
|
|
|
|
'efl_bounce_interpolator.eo',
|
|
|
|
'efl_spring_interpolator.eo',
|
|
|
|
'efl_cubic_bezier_interpolator.eo',
|
2018-08-12 06:26:29 -07:00
|
|
|
'efl_loop_message_future_handler.eo',
|
|
|
|
'efl_loop_message_future.eo',
|
efl_model : rename all efl_model based classes.
Summary:
As the result of discussion in T7458,
we need to rename all efl_model based classes with efl_XXX_Model sequence.
I've run few vote for this, see V42, V43
few classes are totally renamed as our consideration of misnaming.
| Efl.Model_Loop | Efl.Loop_Model |
| Efl.Model_Item | Efl.Generic_Model |
| Efl.Model_Container | Efl.Container_Model |
| Efl.Model_Container_Item | Efl.Container_Model_Item |
| Efl.Model_Composite | Efl.Composite_Model |
| Efl.Model_Composite_Boolean | Efl.Boolean_Model |
| Efl.Model_Composite_Boolean_Chlidren | Efl.Boolean_Model_Item |
| Efl.Model_Composite_Selection | Efl.Select_Model |
| Efl.Model_Composite_Selection_Chlidren | Efl.Select_Model_Item |
| Efl.Model_View | Efl.View_Model |
| Eio.Model | Efl.Io.Model |
| Efl.Ui.Model_State | Efl.Ui.State_Model |
| Efl.Ui.Model_Size | Efl.Ui.Size_Model |
| Efl.Ui.Model_Exact | Efl.Ui.Exact_Model |
| Efl.Ui.Model_Average | Efl.Ui.Average_Model |
| Efl.Ui.Model_Homogeneous | Efl.Ui.Homogeneous_Model |
I worried about Efl.Io.Model changes, cause it is widely used,
but as I tested, there is no issue found yet.
Eldbus.Model also may can changed Efl.Dbus.Model,
but I cannot found any class who using Efl.Dbus namespace,
so I left it future work.
Test Plan:
Run the Make Test,
it works well except Efl test about selection.
there are class inheritance problem exist in select_model,
I reported it and will fix it in another patch.
Reviewers: cedric, felipealmeida, woohyun, Hermet
Reviewed By: cedric
Subscribers: lauromoura
Tags: #efl, #do_not_merge
Differential Revision: https://phab.enlightenment.org/D7533
2019-01-30 20:35:34 -08:00
|
|
|
'efl_loop_model.eo',
|
|
|
|
'efl_generic_model.eo',
|
|
|
|
'efl_container_model.eo',
|
|
|
|
'efl_boolean_model.eo',
|
|
|
|
'efl_composite_model.eo',
|
2019-02-12 12:34:27 -08:00
|
|
|
'efl_core_env.eo',
|
Revert "Revert command line array object because it's broken by design"
This reverts commit a57c7f751023fe1d1edeabbf8683574ac7497e5e.
I pretty much hate to just revert your revert, but you failed to read my
replies, and failed to understand what i was talking about.
And YES we talked at fosdem about the platform issue, and do you
remember my answer, that back in time this might be the case, today is
different freebsd suppoerts setenv, and for windows we have a setenv
implementation in evil. And yes, vtorri also created a issue how bad and
evil this commit is, however, i still fail to see the issue since setenv
unsetenv and clearenv usages are taken as needed. (T7693)
The ownership question is answered in
https://phab.enlightenment.org/D7516#137367.
Can we please get into a state of technical discussions, and not *oh
shit, i am going to revert this* this has been in review for a long
time, a lots of people have tested it, we discussed things on it, and
there was 3 weeks of no reply from you.
The issues that exist will be dealed with. Feel free to create tasks if
you want :)
2019-02-12 12:34:30 -08:00
|
|
|
'efl_core_proc_env.eo',
|
|
|
|
'efl_core_command_line.eo',
|
2019-03-05 14:00:37 -08:00
|
|
|
'efl_loop_timer.eo',
|
2019-04-03 17:25:06 -07:00
|
|
|
'efl_filter_model.eo',
|
2018-08-12 06:26:29 -07:00
|
|
|
]
|
|
|
|
|
|
|
|
foreach eo_file : pub_eo_files
|
|
|
|
pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
|
|
|
|
input : eo_file,
|
|
|
|
output : [eo_file + '.h'],
|
2018-10-21 06:55:51 -07:00
|
|
|
depfile : eo_file + '.d',
|
2018-08-12 06:26:29 -07:00
|
|
|
install : true,
|
|
|
|
install_dir : dir_package_include,
|
2018-12-03 09:49:47 -08:00
|
|
|
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
|
2018-08-12 06:26:29 -07:00
|
|
|
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
|
|
|
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
2018-10-21 06:55:51 -07:00
|
|
|
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
2020-09-20 06:23:26 -07:00
|
|
|
'-e', 'ECORE_API',
|
2018-10-21 06:55:51 -07:00
|
|
|
'-gchd', '@INPUT@'])
|
2018-08-12 06:26:29 -07:00
|
|
|
endforeach
|
|
|
|
|
|
|
|
pub_eo_types_files = []
|
|
|
|
|
|
|
|
eolian_include_directories += ['-I', meson.current_source_dir()]
|
|
|
|
|
|
|
|
ecore_header_src = [
|
|
|
|
'Ecore.h',
|
|
|
|
'Ecore_Common.h',
|
|
|
|
'Ecore_Legacy.h',
|
|
|
|
'Ecore_Eo.h',
|
|
|
|
'Efl_Core.h',
|
|
|
|
'efl_general.h',
|
2019-03-06 11:06:16 -08:00
|
|
|
'Ecore_Getopt.h',
|
|
|
|
'ecore_exe_eo.h',
|
2020-09-20 06:23:26 -07:00
|
|
|
'ecore_api.h',
|
2019-03-06 11:06:16 -08:00
|
|
|
'ecore_exe_eo.legacy.h',
|
2019-03-05 14:00:37 -08:00
|
|
|
'efl_loop_timer_eo.legacy.h',
|
2018-08-12 06:26:29 -07:00
|
|
|
]
|
|
|
|
|
2020-05-10 05:41:57 -07:00
|
|
|
ecore_src = files([
|
2018-08-12 06:26:29 -07:00
|
|
|
'efl_app.c',
|
|
|
|
'ecore.c',
|
|
|
|
'ecore_alloc.c',
|
|
|
|
'ecore_anim.c',
|
|
|
|
'ecore_app.c',
|
|
|
|
'ecore_events.c',
|
|
|
|
'ecore_getopt.c',
|
|
|
|
'ecore_glib.c',
|
|
|
|
'ecore_idle_enterer.c',
|
|
|
|
'ecore_idle_exiter.c',
|
|
|
|
'ecore_idler.c',
|
|
|
|
'ecore_job.c',
|
|
|
|
'ecore_main.c',
|
|
|
|
'ecore_event_message.c',
|
|
|
|
'ecore_event_message_handler.c',
|
|
|
|
'efl_loop.c',
|
|
|
|
'efl_loop_consumer.c',
|
|
|
|
'efl_loop_fd.c',
|
|
|
|
'efl_loop_handler.c',
|
|
|
|
'efl_loop_message.c',
|
|
|
|
'efl_loop_message_future.c',
|
|
|
|
'efl_loop_message_handler.c',
|
|
|
|
'efl_loop_message_future_handler.c',
|
|
|
|
'efl_task.c',
|
|
|
|
'efl_io_closer_fd.c',
|
|
|
|
'efl_io_positioner_fd.c',
|
|
|
|
'efl_io_reader_fd.c',
|
|
|
|
'efl_io_sizer_fd.c',
|
|
|
|
'efl_io_writer_fd.c',
|
|
|
|
'efl_io_stdin.c',
|
|
|
|
'efl_io_stdout.c',
|
|
|
|
'efl_io_stderr.c',
|
|
|
|
'efl_io_file.c',
|
|
|
|
'efl_io_copier.c',
|
|
|
|
'efl_io_buffered_stream.c',
|
efl_model : rename all efl_model based classes.
Summary:
As the result of discussion in T7458,
we need to rename all efl_model based classes with efl_XXX_Model sequence.
I've run few vote for this, see V42, V43
few classes are totally renamed as our consideration of misnaming.
| Efl.Model_Loop | Efl.Loop_Model |
| Efl.Model_Item | Efl.Generic_Model |
| Efl.Model_Container | Efl.Container_Model |
| Efl.Model_Container_Item | Efl.Container_Model_Item |
| Efl.Model_Composite | Efl.Composite_Model |
| Efl.Model_Composite_Boolean | Efl.Boolean_Model |
| Efl.Model_Composite_Boolean_Chlidren | Efl.Boolean_Model_Item |
| Efl.Model_Composite_Selection | Efl.Select_Model |
| Efl.Model_Composite_Selection_Chlidren | Efl.Select_Model_Item |
| Efl.Model_View | Efl.View_Model |
| Eio.Model | Efl.Io.Model |
| Efl.Ui.Model_State | Efl.Ui.State_Model |
| Efl.Ui.Model_Size | Efl.Ui.Size_Model |
| Efl.Ui.Model_Exact | Efl.Ui.Exact_Model |
| Efl.Ui.Model_Average | Efl.Ui.Average_Model |
| Efl.Ui.Model_Homogeneous | Efl.Ui.Homogeneous_Model |
I worried about Efl.Io.Model changes, cause it is widely used,
but as I tested, there is no issue found yet.
Eldbus.Model also may can changed Efl.Dbus.Model,
but I cannot found any class who using Efl.Dbus namespace,
so I left it future work.
Test Plan:
Run the Make Test,
it works well except Efl test about selection.
there are class inheritance problem exist in select_model,
I reported it and will fix it in another patch.
Reviewers: cedric, felipealmeida, woohyun, Hermet
Reviewed By: cedric
Subscribers: lauromoura
Tags: #efl, #do_not_merge
Differential Revision: https://phab.enlightenment.org/D7533
2019-01-30 20:35:34 -08:00
|
|
|
'efl_loop_model.c',
|
|
|
|
'efl_generic_model.c',
|
|
|
|
'efl_container_model.c',
|
|
|
|
'efl_composite_model.c',
|
|
|
|
'efl_boolean_model.c',
|
2019-04-03 17:25:06 -07:00
|
|
|
'efl_filter_model.c',
|
2018-11-23 04:26:00 -08:00
|
|
|
'efl_linear_interpolator.c',
|
|
|
|
'efl_accelerate_interpolator.c',
|
|
|
|
'efl_decelerate_interpolator.c',
|
|
|
|
'efl_sinusoidal_interpolator.c',
|
|
|
|
'efl_divisor_interpolator.c',
|
|
|
|
'efl_bounce_interpolator.c',
|
|
|
|
'efl_spring_interpolator.c',
|
|
|
|
'efl_cubic_bezier_interpolator.c',
|
2018-08-12 06:26:29 -07:00
|
|
|
'ecore_main_timechanges.c',
|
|
|
|
'ecore_pipe.c',
|
|
|
|
'ecore_poller.c',
|
|
|
|
'ecore_time.c',
|
|
|
|
'ecore_timer.c',
|
|
|
|
'ecore_thread.c',
|
|
|
|
'ecore_throttle.c',
|
|
|
|
'ecore_exe.c',
|
|
|
|
'ecore_exe_private.h',
|
|
|
|
'ecore_private.h',
|
|
|
|
'ecore_internal.h',
|
2018-12-26 03:31:19 -08:00
|
|
|
'ecore_main_common.h',
|
|
|
|
'efl_exe.c',
|
|
|
|
'efl_thread.c',
|
Revert "Revert command line array object because it's broken by design"
This reverts commit a57c7f751023fe1d1edeabbf8683574ac7497e5e.
I pretty much hate to just revert your revert, but you failed to read my
replies, and failed to understand what i was talking about.
And YES we talked at fosdem about the platform issue, and do you
remember my answer, that back in time this might be the case, today is
different freebsd suppoerts setenv, and for windows we have a setenv
implementation in evil. And yes, vtorri also created a issue how bad and
evil this commit is, however, i still fail to see the issue since setenv
unsetenv and clearenv usages are taken as needed. (T7693)
The ownership question is answered in
https://phab.enlightenment.org/D7516#137367.
Can we please get into a state of technical discussions, and not *oh
shit, i am going to revert this* this has been in review for a long
time, a lots of people have tested it, we discussed things on it, and
there was 3 weeks of no reply from you.
The issues that exist will be dealed with. Feel free to create tasks if
you want :)
2019-02-12 12:34:30 -08:00
|
|
|
'efl_appthread.c',
|
2018-12-26 03:31:19 -08:00
|
|
|
'efl_threadio.c',
|
2019-01-03 13:59:01 -08:00
|
|
|
'efl_appthread.c',
|
2019-02-12 12:34:27 -08:00
|
|
|
'efl_core_env.c',
|
|
|
|
'efl_core_proc_env.c',
|
Revert "Revert command line array object because it's broken by design"
This reverts commit a57c7f751023fe1d1edeabbf8683574ac7497e5e.
I pretty much hate to just revert your revert, but you failed to read my
replies, and failed to understand what i was talking about.
And YES we talked at fosdem about the platform issue, and do you
remember my answer, that back in time this might be the case, today is
different freebsd suppoerts setenv, and for windows we have a setenv
implementation in evil. And yes, vtorri also created a issue how bad and
evil this commit is, however, i still fail to see the issue since setenv
unsetenv and clearenv usages are taken as needed. (T7693)
The ownership question is answered in
https://phab.enlightenment.org/D7516#137367.
Can we please get into a state of technical discussions, and not *oh
shit, i am going to revert this* this has been in review for a long
time, a lots of people have tested it, we discussed things on it, and
there was 3 weeks of no reply from you.
The issues that exist will be dealed with. Feel free to create tasks if
you want :)
2019-02-12 12:34:30 -08:00
|
|
|
'efl_core_command_line.c',
|
2020-05-10 05:41:57 -07:00
|
|
|
])
|
2018-08-12 06:26:29 -07:00
|
|
|
|
2018-10-04 09:29:56 -07:00
|
|
|
if sys_windows == true
|
2018-08-12 06:26:29 -07:00
|
|
|
#nothing for now ... needs testing
|
2020-05-10 05:41:57 -07:00
|
|
|
ecore_src += files(['ecore_exe_win32.c'])
|
2018-08-12 06:26:29 -07:00
|
|
|
else
|
2020-05-10 05:41:57 -07:00
|
|
|
ecore_src += files(['ecore_signal.c', 'ecore_exe_posix.c'])
|
2018-08-12 06:26:29 -07:00
|
|
|
endif
|
|
|
|
|
2018-12-04 11:38:07 -08:00
|
|
|
if get_option('glib') == true and sys_windows == false
|
2020-05-10 05:41:57 -07:00
|
|
|
ecore_ext_deps += dependency('glib-2.0')
|
|
|
|
ecore_ext_deps += dependency('gthread-2.0')
|
2018-08-12 06:26:29 -07:00
|
|
|
config_h.set('GLIB_INTEGRATION_ALWAYS', '1')
|
|
|
|
config_h.set('HAVE_GLIB', '1')
|
|
|
|
endif
|
|
|
|
|
|
|
|
if get_option('g-mainloop') == true
|
2019-11-27 09:47:55 -08:00
|
|
|
if get_option('glib') == false
|
|
|
|
error('g-mainloop enabled by glib not. Please enable with -Dglib=true')
|
|
|
|
else
|
|
|
|
config_h.set('USE_G_MAIN_LOOP', '1')
|
|
|
|
endif
|
2018-08-12 06:26:29 -07:00
|
|
|
endif
|
|
|
|
|
|
|
|
ecore_lib = library('ecore',
|
|
|
|
ecore_src, pub_eo_file_target,
|
2020-05-10 05:41:57 -07:00
|
|
|
dependencies: ecore_pub_deps + [ecore_deps, ecore_ext_deps],
|
2018-08-12 06:26:29 -07:00
|
|
|
include_directories : config_dir + [include_directories(join_paths('..','..'))],
|
|
|
|
install: true,
|
2020-09-20 06:23:26 -07:00
|
|
|
c_args : [package_c_args, '-DECORE_BUILD'],
|
2018-08-12 06:26:29 -07:00
|
|
|
version : meson.project_version()
|
|
|
|
)
|
|
|
|
|
|
|
|
ecore = declare_dependency(
|
|
|
|
include_directories: [include_directories('.')],
|
|
|
|
link_with: ecore_lib,
|
|
|
|
sources : pub_eo_file_target + priv_eo_file_target,
|
|
|
|
dependencies: ecore_pub_deps,
|
|
|
|
)
|
|
|
|
|
|
|
|
eolian_ecore_dir = join_paths(eolian_include_dir, package_version_name)
|
|
|
|
|
2019-03-14 09:43:51 -07:00
|
|
|
if get_option('install-eo-files')
|
|
|
|
install_data(pub_eo_files + pub_eo_types_files,
|
|
|
|
install_dir: eolian_ecore_dir
|
|
|
|
)
|
|
|
|
endif
|
2018-08-12 06:26:29 -07:00
|
|
|
|
|
|
|
install_headers(ecore_header_src,
|
|
|
|
install_dir : dir_package_include,
|
|
|
|
)
|
|
|
|
|
|
|
|
#TODO:
|
|
|
|
# HAVE_TIZEN_CONFIGUREATION_MANAGER
|
|
|
|
# avahi
|