The IVI-Shell is a shell for in-vehicle-infotainment systems. Allow to build the ivi shell module and separately also build the ivi-shell user interface example.
Signed-off-by: Michael Tretter <m.tret...@pengutronix.de> --- Changes since v1: - move depends on before select in configuration - move mkdir in front of ifndef - fix indentation --- rules/weston.in | 14 ++++++++++++++ rules/weston.make | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/rules/weston.in b/rules/weston.in index 2e760740c..36ab6257b 100644 --- a/rules/weston.in +++ b/rules/weston.in @@ -87,4 +87,18 @@ config WESTON_INSTALL_CONFIG help Install the Weston configuration file into /etc/xdg/weston +config WESTON_IVISHELL + bool + prompt "IVI-Shell" + +config WESTON_IVISHELL_EXAMPLE + bool + depends on WESTON_IVISHELL + select WESTON_INSTALL_CONFIG + prompt "install example IVI-Shell user interface" + help + Install the example hmi-controller, the IVI-Shell user interface + application, a few demo clients and the weston.ini configuration for + the IVI-Shell. + endif diff --git a/rules/weston.make b/rules/weston.make index c33d0814c..a60fa62b4 100644 --- a/rules/weston.make +++ b/rules/weston.make @@ -65,9 +65,9 @@ WESTON_CONF_OPT := \ --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \ --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \ --disable-junit-xml \ - --disable-ivi-shell \ + --$(call ptx/endis, PTXCONF_WESTON_IVISHELL)-ivi-shell \ --$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \ - --disable-demo-clients-install \ + --$(call ptx/endis, PTXCONF_WESTON_IVISHELL_EXAMPLE)-demo-clients-install \ --disable-lcms \ --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \ --with-cairo=$(call ptx/ifdef, PTXCONF_WESTON_GL,glesv2,image) \ @@ -83,11 +83,18 @@ $(STATEDIR)/weston.install: @$(call world/install, WESTON) @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston +ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE @bindir="/usr/bin" \ abs_top_builddir="/usr/bin" \ libexecdir="/usr/libexec" \ ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \ "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini" +else + @bindir="/usr/bin" \ + westondatadir="/usr/share/weston" \ + ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \ + "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini" +endif @$(call touch) @@ -135,6 +142,9 @@ ifdef PTXCONF_WESTON_GL endif @$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell) @$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell) +ifdef PTXCONF_WESTON_IVISHELL + @$(call install_lib, weston, 0, 0, 0644, weston/ivi-shell) +endif ifdef PTXCONF_WESTON_SYSTEMD @$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify) endif @@ -161,6 +171,32 @@ ifdef PTXCONF_WESTON_INSTALL_CONFIG @$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini) endif +ifdef PTXCONF_WESTON_IVISHELL_EXAMPLE + @$(call install_lib, weston, 0, 0, 0644, weston/hmi-controller) + @$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-ivi-shell-user-interface) + + @$(foreach image, \ + background.png \ + fullscreen.png \ + home.png \ + icon_ivi_clickdot.png \ + icon_ivi_flower.png \ + icon_ivi_simple-egl.png \ + icon_ivi_simple-shm.png \ + icon_ivi_smoke.png \ + panel.png \ + random.png \ + sidebyside.png \ + tiling.png, \ + $(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl)) + + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-clickdot) + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-flower) + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-egl) + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-shm) + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-smoke) +endif + @$(call install_finish, weston) @$(call touch) -- 2.18.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de