[PATCH weston v2] ivi-shell: use install paths in example config

Wed Jun 27 11:01:30 UTC 2018

Hi,

On Fri, 25 May 2018 08:46:16 +0200, Michael Tretter wrote:
> On Thu, 24 May 2018 17:08:47 +0200, Emre Ucan wrote:
> > The example weston.ini file uses source and build
> > directory paths. Therefore, it is only useful when
> > used on the same system that is used to build Weston.
> > 
> > We can use install paths instead of build/source paths
> > to fix this problem.
> > 
> > v2 changes:
> > - use $(westondatadir) instead of $(datadir)
> > 
> > Reported-by: Michael Tretter <m.tretter at pengutronix.de>
> > Signed-off-by: Emre Ucan <eucan at de.adit-jv.com>  
> 
> Reviewed-by: Michael Tretter <m.tretter at pengutronix.de>

Some variables that this patch touches have already been removed, but I
think it would still make change to rename 'abs_top_builddir' and
'abs_top_srcdir'. Is there anything preventing this patch from being
applied?

Michael

> 
> Thanks
> 
> Michael
> 
> > ---
> >  Makefile.am             |  4 +---
> >  ivi-shell/weston.ini.in | 60 ++++++++++++++++++++++++-------------------------
> >  2 files changed, 31 insertions(+), 33 deletions(-)
> > 
> > diff --git a/Makefile.am b/Makefile.am
> > index 69ca6cb..819c9c9 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -24,10 +24,8 @@ weston.ini : $(srcdir)/weston.ini.in
> >  ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
> >  	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
> >  		-e 's|@bindir[@]|$(bindir)|g' \
> > -		-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
> > -		-e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
> >  		-e 's|@libexecdir[@]|$(libexecdir)|g' \
> > -		-e 's|@plugin_prefix[@]||g' \
> > +		-e 's|@westondatadir[@]|$(westondatadir)|g' \
> >  		$< > $@
> >  
> >  all-local : weston.ini ivi-shell/weston.ini
> > diff --git a/ivi-shell/weston.ini.in b/ivi-shell/weston.ini.in
> > index 3f11e1c..58cba54 100644
> > --- a/ivi-shell/weston.ini.in
> > +++ b/ivi-shell/weston.ini.in
> > @@ -1,9 +1,9 @@
> >  [core]
> > -shell=@plugin_prefix at ivi-shell.so
> > -modules=@plugin_prefix at hmi-controller.so
> > +shell=ivi-shell.so
> > +modules=hmi-controller.so
> >  
> >  [ivi-shell]
> > -ivi-shell-user-interface=@abs_top_builddir@/weston-ivi-shell-user-interface
> > +ivi-shell-user-interface=@libexecdir@/weston-ivi-shell-user-interface
> >  
> >  #developermode=true
> >  
> > @@ -19,20 +19,20 @@ application-layer-id=4000
> >  
> >  transition-duration=300
> >  
> > -background-image=@abs_top_srcdir@/data/background.png
> > +background-image=@westondatadir@/background.png
> >  background-id=1001
> > -panel-image=@abs_top_srcdir@/data/panel.png
> > +panel-image=@westondatadir@/panel.png
> >  panel-id=1002
> >  surface-id-offset=10
> > -tiling-image=@abs_top_srcdir@/data/tiling.png
> > +tiling-image=@westondatadir@/tiling.png
> >  tiling-id=1003
> > -sidebyside-image=@abs_top_srcdir@/data/sidebyside.png
> > +sidebyside-image=@westondatadir@/sidebyside.png
> >  sidebyside-id=1004
> > -fullscreen-image=@abs_top_srcdir@/data/fullscreen.png
> > +fullscreen-image=@westondatadir@/fullscreen.png
> >  fullscreen-id=1005
> > -random-image=@abs_top_srcdir@/data/random.png
> > +random-image=@westondatadir@/random.png
> >  random-id=1006
> > -home-image=@abs_top_srcdir@/data/home.png
> > +home-image=@westondatadir@/home.png
> >  home-id=1007
> >  workspace-background-color=0x99000000
> >  workspace-background-id=2001
> > @@ -43,59 +43,59 @@ path=@libexecdir@/weston-keyboard
> >  [ivi-launcher]
> >  workspace-id=0
> >  icon-id=4001
> > -icon=@abs_top_srcdir@/data/icon_ivi_flower.png
> > -path=@abs_top_builddir@/weston-flower
> > +icon=@westondatadir@/icon_ivi_flower.png
> > +path=@bindir@/weston-flower
> >  
> >  [ivi-launcher]
> >  workspace-id=0
> >  icon-id=4002
> > -icon=@abs_top_srcdir@/data/icon_ivi_clickdot.png
> > -path=@abs_top_builddir@/weston-clickdot
> > +icon=@westondatadir@/icon_ivi_clickdot.png
> > +path=@bindir@/weston-clickdot
> >  
> >  [ivi-launcher]
> >  workspace-id=1
> >  icon-id=4003
> > -icon=@abs_top_srcdir@/data/icon_ivi_simple-egl.png
> > -path=@abs_top_builddir@/weston-simple-egl
> > +icon=@westondatadir@/icon_ivi_simple-egl.png
> > +path=@bindir@/weston-simple-egl
> >  
> >  [ivi-launcher]
> >  workspace-id=1
> >  icon-id=4004
> > -icon=@abs_top_srcdir@/data/icon_ivi_simple-shm.png
> > -path=@abs_top_builddir@/weston-simple-shm
> > +icon=@westondatadir@/icon_ivi_simple-shm.png
> > +path=@bindir@/weston-simple-shm
> >  
> >  [ivi-launcher]
> >  workspace-id=2
> >  icon-id=4005
> > -icon=@abs_top_srcdir@/data/icon_ivi_smoke.png
> > -path=@abs_top_builddir@/weston-smoke
> > +icon=@westondatadir@/icon_ivi_smoke.png
> > +path=@bindir@/weston-smoke
> >  
> >  [ivi-launcher]
> >  workspace-id=3
> >  icon-id=4006
> > -icon=@abs_top_srcdir@/data/icon_ivi_flower.png
> > -path=@abs_top_builddir@/weston-flower
> > +icon=@westondatadir@/icon_ivi_flower.png
> > +path=@bindir@/weston-flower
> >  
> >  [ivi-launcher]
> >  workspace-id=3
> >  icon-id=4007
> > -icon=@abs_top_srcdir@/data/icon_ivi_clickdot.png
> > -path=@abs_top_builddir@/weston-clickdot
> > +icon=@westondatadir@/icon_ivi_clickdot.png
> > +path=@bindir@/weston-clickdot
> >  
> >  [ivi-launcher]
> >  workspace-id=3
> >  icon-id=4008
> > -icon=@abs_top_srcdir@/data/icon_ivi_simple-egl.png
> > -path=@abs_top_builddir@/weston-simple-egl
> > +icon=@westondatadir@/icon_ivi_simple-egl.png
> > +path=@bindir@/weston-simple-egl
> >  
> >  [ivi-launcher]
> >  workspace-id=3
> >  icon-id=4009
> > -icon=@abs_top_srcdir@/data/icon_ivi_simple-shm.png
> > -path=@abs_top_builddir@/weston-simple-shm
> > +icon=@westondatadir@/icon_ivi_simple-shm.png
> > +path=@bindir@/weston-simple-shm
> >  
> >  [ivi-launcher]
> >  workspace-id=3
> >  icon-id=4010
> > -icon=@abs_top_srcdir@/data/icon_ivi_smoke.png
> > -path=@abs_top_builddir@/weston-smoke
> > +icon=@westondatadir@/icon_ivi_smoke.png
> > +path=@bindir@/weston-smoke  
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/wayland-devel