RE: [PATCH 1/1] install data file

2010-03-11 Thread Marcel Holtmann
Hi Martin,

> > >  Makefile.am |2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > >
> > > diff --git a/Makefile.am b/Makefile.am
> > > index fcee5e6..007d5b9 100644
> > > --- a/Makefile.am
> > > +++ b/Makefile.am
> > > @@ -45,7 +45,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
> > >
> > >  CLEANFILES = src/control.moc $(nodist_src_phonesim_SOURCES)
> > >
> > > -EXTRA_DIST = src/controlbase.ui src/default.xml src/GSMSpecification.xml
> > > +dist_pkgdata_DATA = src/controlbase.ui src/moblin.xml
> > src/GSMSpecification.xml
> > >
> > 
> > this looks wrong. You should not be installing src/controlbase.ui and
> > don't bother installing GSMSpecification.xml. I just put that into the
> > source code for reference.
> > 
> > Also if you wanna install default.xml, then it needs to be installed
> > in /etc/phonesim/ and not just somewhere.
> I am afraid that I am not be persuaded. ;-)
> 
> I think *.xml is the data file containing the AT commands simulation data, 
> and not the config file. So I think it is not suitable to put it at /etc.
> And the proper place is data directory, /usr/share/phonesim. And install 
> GSMSpecification.xml there is convenient for user to reference, they need not 
> find the source package. 
> Think of wpa_s package, they will put all the types of conf example at 
> example directory

I have no strong preference one way or the other. I would be fully okay
with having this installed in /usr/share/phonesim and have phonesim use
the default.xml by default.

So please send a patch that just installs the default.xml and verify
that it is installed properly. Check as I explained in my previous
email.

Regards

Marcel


___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono


RE: [PATCH 1/1] install data file

2010-03-10 Thread Xu, Martin
> -Original Message-
> From: ofono-boun...@ofono.org [mailto:ofono-boun...@ofono.org] On Behalf
> Of Marcel Holtmann
> Sent: Thursday, March 11, 2010 12:59 AM
> To: ofono@ofono.org
> Subject: Re: [PATCH 1/1] install data file
> 
> Hi Martin,
> 
> >  Makefile.am |2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/Makefile.am b/Makefile.am
> > index fcee5e6..007d5b9 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -45,7 +45,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
> >
> >  CLEANFILES = src/control.moc $(nodist_src_phonesim_SOURCES)
> >
> > -EXTRA_DIST = src/controlbase.ui src/default.xml src/GSMSpecification.xml
> > +dist_pkgdata_DATA = src/controlbase.ui src/moblin.xml
> src/GSMSpecification.xml
> >
> 
> this looks wrong. You should not be installing src/controlbase.ui and
> don't bother installing GSMSpecification.xml. I just put that into the
> source code for reference.
> 
> Also if you wanna install default.xml, then it needs to be installed
> in /etc/phonesim/ and not just somewhere.
I am afraid that I am not be persuaded. ;-)

I think *.xml is the data file containing the AT commands simulation data, and 
not the config file. So I think it is not suitable to put it at /etc.
And the proper place is data directory, /usr/share/phonesim. And install 
GSMSpecification.xml there is convenient for user to reference, they need not 
find the source package. 
Think of wpa_s package, they will put all the types of conf example at example 
directory
___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono


Re: [PATCH 1/1] install data file

2010-03-10 Thread Marcel Holtmann
Hi Martin,

>  Makefile.am |2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index fcee5e6..007d5b9 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -45,7 +45,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
>  
>  CLEANFILES = src/control.moc $(nodist_src_phonesim_SOURCES)
>  
> -EXTRA_DIST = src/controlbase.ui src/default.xml src/GSMSpecification.xml
> +dist_pkgdata_DATA = src/controlbase.ui src/moblin.xml 
> src/GSMSpecification.xml
>  

this looks wrong. You should not be installing src/controlbase.ui and
don't bother installing GSMSpecification.xml. I just put that into the
source code for reference.

Also if you wanna install default.xml, then it needs to be installed
in /etc/phonesim/ and not just somewhere.

Please run a "make install DESTDIR=$PWD/x" as normal user from the build
directory of phonesim. Then "find x" will show you the directory layout
of the installation.

Regards

Marcel


___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono


RE: [PATCH 1/1] install data file

2010-03-09 Thread Xu, Martin
Please ignore the patch. 
I just found that Denis has changed moblin.xml to default.xml. ;-) I will send 
modified patch soon.

> -Original Message-
> From: Xu, Martin
> Sent: Wednesday, March 10, 2010 11:51 AM
> To: ofono@ofono.org
> Cc: Xu, Martin
> Subject: [PATCH 1/1] install data file
> 
> ---
>  Makefile.am |2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index fcee5e6..007d5b9 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -45,7 +45,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
> 
>  CLEANFILES = src/control.moc $(nodist_src_phonesim_SOURCES)
> 
> -EXTRA_DIST = src/controlbase.ui src/default.xml src/GSMSpecification.xml
> +dist_pkgdata_DATA = src/controlbase.ui src/moblin.xml
> src/GSMSpecification.xml
> 
>  MAINTAINERCLEANFILES = Makefile.in \
>   aclocal.m4 configure depcomp missing install-sh
> --
> 1.6.1.3

___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono


[PATCH 1/1] install data file

2010-03-09 Thread Martin Xu
---
 Makefile.am |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fcee5e6..007d5b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
 
 CLEANFILES = src/control.moc $(nodist_src_phonesim_SOURCES)
 
-EXTRA_DIST = src/controlbase.ui src/default.xml src/GSMSpecification.xml
+dist_pkgdata_DATA = src/controlbase.ui src/moblin.xml src/GSMSpecification.xml
 
 MAINTAINERCLEANFILES = Makefile.in \
aclocal.m4 configure depcomp missing install-sh
-- 
1.6.1.3

___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono