16e3f27fc7
In commit d8e09afc9f1e ("tests: Convert ivi-shell-app-test.c to use
`weston_ini_setup`") the reference weston.ini for the ivi-shell was
removed, because it is not required by the test anymore.
The reference weston.ini still has value as an example for the ivi-shell
and how the ivi-shell-user-interface has to be configured. Retrieving
this information from the test case is not intuitive. Furthermore, the
file is still referenced by the ivi-shell/README, and the
configuration_data for generating the file was not fully removed.
Bring back the reference weston.ini for the ivi-shell and, while at it, cleanup
the configuration_data() to define only keys that are actually used in
weston.ivi.in.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
60 lines
1.4 KiB
Meson
60 lines
1.4 KiB
Meson
if get_option('shell-ivi')
|
|
srcs_shell_ivi = [
|
|
'ivi-shell.c',
|
|
'ivi-layout.c',
|
|
'ivi-layout-transition.c',
|
|
ivi_application_server_protocol_h,
|
|
ivi_application_protocol_c,
|
|
input_method_unstable_v1_server_protocol_h,
|
|
input_method_unstable_v1_protocol_c,
|
|
]
|
|
plugin_shell_ivi = shared_library(
|
|
'ivi-shell',
|
|
srcs_shell_ivi,
|
|
include_directories: common_inc,
|
|
dependencies: [
|
|
dep_libm,
|
|
dep_libexec_weston,
|
|
dep_lib_desktop,
|
|
dep_libweston_public
|
|
],
|
|
name_prefix: '',
|
|
install: true,
|
|
install_dir: dir_module_weston,
|
|
install_rpath: '$ORIGIN'
|
|
)
|
|
env_modmap += 'ivi-shell.so=@0@;'.format(plugin_shell_ivi.full_path())
|
|
|
|
install_headers('ivi-layout-export.h', subdir: 'weston')
|
|
|
|
srcs_ivi_hmi = [
|
|
'hmi-controller.c',
|
|
ivi_hmi_controller_server_protocol_h,
|
|
ivi_hmi_controller_protocol_c,
|
|
]
|
|
plugin_ivi_hmi = shared_library(
|
|
'hmi-controller',
|
|
srcs_ivi_hmi,
|
|
include_directories: common_inc,
|
|
dependencies: [
|
|
dep_libexec_weston,
|
|
dep_libweston_public,
|
|
dep_libshared
|
|
],
|
|
name_prefix: '',
|
|
install: true,
|
|
install_dir: dir_module_weston,
|
|
install_rpath: '$ORIGIN'
|
|
)
|
|
env_modmap += 'hmi-controller.so=@0@;'.format(plugin_ivi_hmi.full_path())
|
|
|
|
ivi_test_config = configuration_data()
|
|
ivi_test_config.set('bindir', dir_bin)
|
|
ivi_test_config.set('westondatadir', dir_data / 'weston')
|
|
configure_file(
|
|
input: 'weston.ini.in',
|
|
output: 'weston.ini',
|
|
configuration: ivi_test_config
|
|
)
|
|
endif
|