Re: [ptxdist] [PATCH 3/3] weston: add IVI-Shell support

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Aug 31, 2018 at 08:11:01AM +0200, Ladislav Michl wrote:
> On Thu, Aug 30, 2018 at 06:23:30PM +0200, Michael Tretter wrote:
> > 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.tretter@pengutronix.de>
> > ---
> >  rules/weston.in   | 14 ++++++++++++++
> >  rules/weston.make | 41 +++++++++++++++++++++++++++++++++++++++--
> >  2 files changed, 53 insertions(+), 2 deletions(-)
> > 
> > diff --git a/rules/weston.in b/rules/weston.in
> > index 2e760740c..77789a23b 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
> > +	select WESTON_INSTALL_CONFIG
> > +	depends on WESTON_IVISHELL
> 
> a more common patters seems to have "depends on" first
> 
> > +	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 1e08b8c80..8f208c4d2 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) \
> > @@ -82,12 +82,20 @@ $(STATEDIR)/weston.install:
> >  	@$(call targetinfo)
> >  	@$(call world/install, WESTON)
> >  
> > +ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE
> >  	@mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
> >  	 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
> > +	@mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
> > +	 westondatadir="/usr/share/weston" \
> > +	 bindir="/usr/bin" \
> 
> spaces after tab

And move the mkdir befor the ifndef.

Michael

> 
> > +	ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \
> > +		"$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> > +endif
> >  
> >  	@$(call touch)
> >  
> > @@ -135,6 +143,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 +172,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
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de