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

[Ucan, Emre (ADITG/ESB)]

Hi,

> -----Original Message-----
> From: Michael Tretter [mailto:m.tretter at pengutronix.de]
> Sent: Donnerstag, 24. Mai 2018 16:21
> To: Ucan, Emre (ADITG/ESB) <eucan at de.adit-jv.com>; wayland-
> devel at lists.freedesktop.org
> Subject: Re: [PATCH weston] ivi-shell: use install paths in example config
> 
> On Thu, 24 May 2018 15:44:40 +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.
> 
> The main weston.ini.in still uses @abs_top_srcdir at . Shouldn't
> this be changed as well?

This can be done. The reported issue was for ivi-shell. Therefore, I fixed that.
Furthermore, the main weston.ini has many hard coded paths, e.g.:
[launcher]
icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png
path=/usr/bin/gnome-terminal

Therefore, just changing src directories to install directories does not make it portable.

> 
> >
> > Reported-by: Michael Tretter <m.tretter at pengutronix.de>
> > Signed-off-by: Emre Ucan <eucan at de.adit-jv.com>
> > ---
> >  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..b5f29bc 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|@datadir[@]|$(datadir)|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..51238e3 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=@datadir@/weston/background.png
> 
> This still duplicates the sub-directory "weston/" from Makefile.am.
> Similar to my earlier patch, we should use @westondatadir@, which is
> used as install location in Makefile.am, instead of
> @datadir@/weston as path.

Fine, I will fix this and send a new patch.

Emre
> 
> Michael
> 
> >  background-id=1001
> > -panel-image=@abs_top_srcdir@/data/panel.png
> > +panel-image=@datadir@/weston/panel.png
> >  panel-id=1002
> >  surface-id-offset=10