Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
> > > > Hi > > On Fri, Feb 15, 2019 at 8:49 PM Marc-André Lureau > > wrote: > > > > > > Hi > > > > > > On Fri, Feb 15, 2019 at 6:21 PM Frediano Ziglio > > > wrote: > > > > Looking at http://mesonbuild.com/Subprojects.html looks like > > > > subprojects should be Meson project too. > > > > While spice-common is now a Meson project keycodemapdb is not > > > > so it does not seem that great to declare it as subproject. > > > > > > Ok, it's a bit silly imho. Let's make one then: > > > https://gitlab.com/keycodemap/keycodemapdb/merge_requests/7 > > > > It's applied now, ack with the subproject update? > > > > Can you send a new series version? > Too much updates. > I changed my mind, merged. Any missing patch? Frediano ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
> > Hi > On Fri, Feb 15, 2019 at 8:49 PM Marc-André Lureau > wrote: > > > > Hi > > > > On Fri, Feb 15, 2019 at 6:21 PM Frediano Ziglio wrote: > > > Looking at http://mesonbuild.com/Subprojects.html looks like > > > subprojects should be Meson project too. > > > While spice-common is now a Meson project keycodemapdb is not > > > so it does not seem that great to declare it as subproject. > > > > Ok, it's a bit silly imho. Let's make one then: > > https://gitlab.com/keycodemap/keycodemapdb/merge_requests/7 > > It's applied now, ack with the subproject update? > Can you send a new series version? Too much updates. Frediano ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
Hi On Fri, Feb 15, 2019 at 8:49 PM Marc-André Lureau wrote: > > Hi > > On Fri, Feb 15, 2019 at 6:21 PM Frediano Ziglio wrote: > > Looking at http://mesonbuild.com/Subprojects.html looks like > > subprojects should be Meson project too. > > While spice-common is now a Meson project keycodemapdb is not > > so it does not seem that great to declare it as subproject. > > Ok, it's a bit silly imho. Let's make one then: > https://gitlab.com/keycodemap/keycodemapdb/merge_requests/7 It's applied now, ack with the subproject update? > > -- > Marc-André Lureau -- Marc-André Lureau ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
> > Hi > > On Fri, Feb 15, 2019 at 6:21 PM Frediano Ziglio wrote: > > Looking at http://mesonbuild.com/Subprojects.html looks like > > subprojects should be Meson project too. > > While spice-common is now a Meson project keycodemapdb is not > > so it does not seem that great to declare it as subproject. > > Ok, it's a bit silly imho. Let's make one then: > https://gitlab.com/keycodemap/keycodemapdb/merge_requests/7 > Yes, or use wrap-git Frediano ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
Hi On Fri, Feb 15, 2019 at 6:21 PM Frediano Ziglio wrote: > Looking at http://mesonbuild.com/Subprojects.html looks like > subprojects should be Meson project too. > While spice-common is now a Meson project keycodemapdb is not > so it does not seem that great to declare it as subproject. Ok, it's a bit silly imho. Let's make one then: https://gitlab.com/keycodemap/keycodemapdb/merge_requests/7 -- Marc-André Lureau ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
> Hi
>
> On Fri, Feb 15, 2019 at 5:21 PM Frediano Ziglio wrote:
> >
> > > Hi
> > >
> > > On Fri, Feb 15, 2019 at 4:04 PM Frediano Ziglio
> > > wrote:
> > > >
> > > > >
> > > > > From: Marc-André Lureau
> > > > >
> > > > > Follow meson build system conventions.
> > > > >
> > > > > This will allow meson to handle it as a subproject.
> > > > >
> > > > > Signed-off-by: Marc-André Lureau
> > > > > ---
> > > > > Changes since v1:
> > > > > - rebase;
> > > > > - support still Autoconf.
> > > > > ---
> > > > > .gitmodules | 4 ++--
> > > > > meson.build | 6 +-
> > > > > src/Makefile.am | 20 ++--
> > > > > src/meson.build | 2 --
> > > > > {src => subprojects}/keycodemapdb | 0
> > > > > 5 files changed, 17 insertions(+), 15 deletions(-)
> > > > > rename {src => subprojects}/keycodemapdb (100%)
> > > > >
> > > > > diff --git a/.gitmodules b/.gitmodules
> > > > > index 6938cd0c..a7804e6f 100644
> > > > > --- a/.gitmodules
> > > > > +++ b/.gitmodules
> > > > > @@ -1,6 +1,6 @@
> > > > > [submodule "spice-common"]
> > > > > path = subprojects/spice-common
> > > > > url = ../spice-common.git
> > > > > -[submodule "src/keycodemapdb"]
> > > > > - path = src/keycodemapdb
> > > > > +[submodule "subprojects/keycodemapdb"]
> >
> > Why don't we call it just "keycodemapdb", is not necessary to
> > follow the path (also would be coherent with "spice-common").
>
> Tbh, I don't care.
>
> >
> > > > > + path = subprojects/keycodemapdb
> > > > > url = https://gitlab.com/keycodemap/keycodemapdb.git
> > > > > diff --git a/meson.build b/meson.build
> > > > > index 1276fb95..9fa94fc4 100644
> > > > > --- a/meson.build
> > > > > +++ b/meson.build
> > > > > @@ -38,12 +38,16 @@ spice_gtk_deps = []
> > > > > spice_acl_deps = []
> > > > >
> > > > > #
> > > > > -# Spice common subproject
> > > > > +# Set up subprojects
> > > > > #
> > > > > spice_common = subproject('spice-common', default_options :
> > > > > ['generate-code=client'])
> > > > >
> > > > > spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
> > > > > spice_glib_deps +=
> > > > > spice_common.get_variable('spice_common_client_dep')
> > > > >
> > > > > +subproject('keycodemapdb', required : false)
> > > >
> > > > Why required is false? I don't think spice-gtk will compile
> > > > without it.
> > >
> > > I don't remember adding that, please remove if you commit.
> > >
> >
> > Not a nice idea. Meson is expecting a meson.build inside it and
> > fails.
>
> Ah that rings a bell :)
>
> thanks for checking
>
Looking at http://mesonbuild.com/Subprojects.html looks like
subprojects should be Meson project too.
While spice-common is now a Meson project keycodemapdb is not
so it does not seem that great to declare it as subproject.
Frediano
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
Hi
On Fri, Feb 15, 2019 at 5:21 PM Frediano Ziglio wrote:
>
> > Hi
> >
> > On Fri, Feb 15, 2019 at 4:04 PM Frediano Ziglio wrote:
> > >
> > > >
> > > > From: Marc-André Lureau
> > > >
> > > > Follow meson build system conventions.
> > > >
> > > > This will allow meson to handle it as a subproject.
> > > >
> > > > Signed-off-by: Marc-André Lureau
> > > > ---
> > > > Changes since v1:
> > > > - rebase;
> > > > - support still Autoconf.
> > > > ---
> > > > .gitmodules | 4 ++--
> > > > meson.build | 6 +-
> > > > src/Makefile.am | 20 ++--
> > > > src/meson.build | 2 --
> > > > {src => subprojects}/keycodemapdb | 0
> > > > 5 files changed, 17 insertions(+), 15 deletions(-)
> > > > rename {src => subprojects}/keycodemapdb (100%)
> > > >
> > > > diff --git a/.gitmodules b/.gitmodules
> > > > index 6938cd0c..a7804e6f 100644
> > > > --- a/.gitmodules
> > > > +++ b/.gitmodules
> > > > @@ -1,6 +1,6 @@
> > > > [submodule "spice-common"]
> > > > path = subprojects/spice-common
> > > > url = ../spice-common.git
> > > > -[submodule "src/keycodemapdb"]
> > > > - path = src/keycodemapdb
> > > > +[submodule "subprojects/keycodemapdb"]
>
> Why don't we call it just "keycodemapdb", is not necessary to
> follow the path (also would be coherent with "spice-common").
Tbh, I don't care.
>
> > > > + path = subprojects/keycodemapdb
> > > > url = https://gitlab.com/keycodemap/keycodemapdb.git
> > > > diff --git a/meson.build b/meson.build
> > > > index 1276fb95..9fa94fc4 100644
> > > > --- a/meson.build
> > > > +++ b/meson.build
> > > > @@ -38,12 +38,16 @@ spice_gtk_deps = []
> > > > spice_acl_deps = []
> > > >
> > > > #
> > > > -# Spice common subproject
> > > > +# Set up subprojects
> > > > #
> > > > spice_common = subproject('spice-common', default_options :
> > > > ['generate-code=client'])
> > > >
> > > > spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
> > > > spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
> > > >
> > > > +subproject('keycodemapdb', required : false)
> > >
> > > Why required is false? I don't think spice-gtk will compile
> > > without it.
> >
> > I don't remember adding that, please remove if you commit.
> >
>
> Not a nice idea. Meson is expecting a meson.build inside it and
> fails.
Ah that rings a bell :)
thanks for checking
--
Marc-André Lureau
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
> Hi
>
> On Fri, Feb 15, 2019 at 4:04 PM Frediano Ziglio wrote:
> >
> > >
> > > From: Marc-André Lureau
> > >
> > > Follow meson build system conventions.
> > >
> > > This will allow meson to handle it as a subproject.
> > >
> > > Signed-off-by: Marc-André Lureau
> > > ---
> > > Changes since v1:
> > > - rebase;
> > > - support still Autoconf.
> > > ---
> > > .gitmodules | 4 ++--
> > > meson.build | 6 +-
> > > src/Makefile.am | 20 ++--
> > > src/meson.build | 2 --
> > > {src => subprojects}/keycodemapdb | 0
> > > 5 files changed, 17 insertions(+), 15 deletions(-)
> > > rename {src => subprojects}/keycodemapdb (100%)
> > >
> > > diff --git a/.gitmodules b/.gitmodules
> > > index 6938cd0c..a7804e6f 100644
> > > --- a/.gitmodules
> > > +++ b/.gitmodules
> > > @@ -1,6 +1,6 @@
> > > [submodule "spice-common"]
> > > path = subprojects/spice-common
> > > url = ../spice-common.git
> > > -[submodule "src/keycodemapdb"]
> > > - path = src/keycodemapdb
> > > +[submodule "subprojects/keycodemapdb"]
Why don't we call it just "keycodemapdb", is not necessary to
follow the path (also would be coherent with "spice-common").
> > > + path = subprojects/keycodemapdb
> > > url = https://gitlab.com/keycodemap/keycodemapdb.git
> > > diff --git a/meson.build b/meson.build
> > > index 1276fb95..9fa94fc4 100644
> > > --- a/meson.build
> > > +++ b/meson.build
> > > @@ -38,12 +38,16 @@ spice_gtk_deps = []
> > > spice_acl_deps = []
> > >
> > > #
> > > -# Spice common subproject
> > > +# Set up subprojects
> > > #
> > > spice_common = subproject('spice-common', default_options :
> > > ['generate-code=client'])
> > >
> > > spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
> > > spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
> > >
> > > +subproject('keycodemapdb', required : false)
> >
> > Why required is false? I don't think spice-gtk will compile
> > without it.
>
> I don't remember adding that, please remove if you commit.
>
Not a nice idea. Meson is expecting a meson.build inside it and
fails.
Frediano
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
On Fri, Feb 15, 2019 at 4:54 PM Frediano Ziglio wrote:
>
> > Hi
> >
> > On Fri, Feb 15, 2019 at 4:04 PM Frediano Ziglio wrote:
> > >
> > > >
> > > > From: Marc-André Lureau
> > > >
> > > > Follow meson build system conventions.
> > > >
> > > > This will allow meson to handle it as a subproject.
> > > >
> > > > Signed-off-by: Marc-André Lureau
> > > > ---
> > > > Changes since v1:
> > > > - rebase;
> > > > - support still Autoconf.
> > > > ---
> > > > .gitmodules | 4 ++--
> > > > meson.build | 6 +-
> > > > src/Makefile.am | 20 ++--
> > > > src/meson.build | 2 --
> > > > {src => subprojects}/keycodemapdb | 0
> > > > 5 files changed, 17 insertions(+), 15 deletions(-)
> > > > rename {src => subprojects}/keycodemapdb (100%)
> > > >
> > > > diff --git a/.gitmodules b/.gitmodules
> > > > index 6938cd0c..a7804e6f 100644
> > > > --- a/.gitmodules
> > > > +++ b/.gitmodules
> > > > @@ -1,6 +1,6 @@
> > > > [submodule "spice-common"]
> > > > path = subprojects/spice-common
> > > > url = ../spice-common.git
> > > > -[submodule "src/keycodemapdb"]
> > > > - path = src/keycodemapdb
> > > > +[submodule "subprojects/keycodemapdb"]
> > > > + path = subprojects/keycodemapdb
> > > > url = https://gitlab.com/keycodemap/keycodemapdb.git
> > > > diff --git a/meson.build b/meson.build
> > > > index 1276fb95..9fa94fc4 100644
> > > > --- a/meson.build
> > > > +++ b/meson.build
> > > > @@ -38,12 +38,16 @@ spice_gtk_deps = []
> > > > spice_acl_deps = []
> > > >
> > > > #
> > > > -# Spice common subproject
> > > > +# Set up subprojects
> > > > #
> > > > spice_common = subproject('spice-common', default_options :
> > > > ['generate-code=client'])
> > > >
> > > > spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
> > > > spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
> > > >
> > > > +subproject('keycodemapdb', required : false)
> > >
> > > Why required is false? I don't think spice-gtk will compile
> > > without it.
> >
> > I don't remember adding that, please remove if you commit.
> >
>
> I can do it. Are you fine with the Autoconf addition? Do you ack?
ack
thanks
--
Marc-André Lureau
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
> Hi
>
> On Fri, Feb 15, 2019 at 4:04 PM Frediano Ziglio wrote:
> >
> > >
> > > From: Marc-André Lureau
> > >
> > > Follow meson build system conventions.
> > >
> > > This will allow meson to handle it as a subproject.
> > >
> > > Signed-off-by: Marc-André Lureau
> > > ---
> > > Changes since v1:
> > > - rebase;
> > > - support still Autoconf.
> > > ---
> > > .gitmodules | 4 ++--
> > > meson.build | 6 +-
> > > src/Makefile.am | 20 ++--
> > > src/meson.build | 2 --
> > > {src => subprojects}/keycodemapdb | 0
> > > 5 files changed, 17 insertions(+), 15 deletions(-)
> > > rename {src => subprojects}/keycodemapdb (100%)
> > >
> > > diff --git a/.gitmodules b/.gitmodules
> > > index 6938cd0c..a7804e6f 100644
> > > --- a/.gitmodules
> > > +++ b/.gitmodules
> > > @@ -1,6 +1,6 @@
> > > [submodule "spice-common"]
> > > path = subprojects/spice-common
> > > url = ../spice-common.git
> > > -[submodule "src/keycodemapdb"]
> > > - path = src/keycodemapdb
> > > +[submodule "subprojects/keycodemapdb"]
> > > + path = subprojects/keycodemapdb
> > > url = https://gitlab.com/keycodemap/keycodemapdb.git
> > > diff --git a/meson.build b/meson.build
> > > index 1276fb95..9fa94fc4 100644
> > > --- a/meson.build
> > > +++ b/meson.build
> > > @@ -38,12 +38,16 @@ spice_gtk_deps = []
> > > spice_acl_deps = []
> > >
> > > #
> > > -# Spice common subproject
> > > +# Set up subprojects
> > > #
> > > spice_common = subproject('spice-common', default_options :
> > > ['generate-code=client'])
> > >
> > > spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
> > > spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
> > >
> > > +subproject('keycodemapdb', required : false)
> >
> > Why required is false? I don't think spice-gtk will compile
> > without it.
>
> I don't remember adding that, please remove if you commit.
>
I can do it. Are you fine with the Autoconf addition? Do you ack?
Frediano
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
Hi
On Fri, Feb 15, 2019 at 4:04 PM Frediano Ziglio wrote:
>
> >
> > From: Marc-André Lureau
> >
> > Follow meson build system conventions.
> >
> > This will allow meson to handle it as a subproject.
> >
> > Signed-off-by: Marc-André Lureau
> > ---
> > Changes since v1:
> > - rebase;
> > - support still Autoconf.
> > ---
> > .gitmodules | 4 ++--
> > meson.build | 6 +-
> > src/Makefile.am | 20 ++--
> > src/meson.build | 2 --
> > {src => subprojects}/keycodemapdb | 0
> > 5 files changed, 17 insertions(+), 15 deletions(-)
> > rename {src => subprojects}/keycodemapdb (100%)
> >
> > diff --git a/.gitmodules b/.gitmodules
> > index 6938cd0c..a7804e6f 100644
> > --- a/.gitmodules
> > +++ b/.gitmodules
> > @@ -1,6 +1,6 @@
> > [submodule "spice-common"]
> > path = subprojects/spice-common
> > url = ../spice-common.git
> > -[submodule "src/keycodemapdb"]
> > - path = src/keycodemapdb
> > +[submodule "subprojects/keycodemapdb"]
> > + path = subprojects/keycodemapdb
> > url = https://gitlab.com/keycodemap/keycodemapdb.git
> > diff --git a/meson.build b/meson.build
> > index 1276fb95..9fa94fc4 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -38,12 +38,16 @@ spice_gtk_deps = []
> > spice_acl_deps = []
> >
> > #
> > -# Spice common subproject
> > +# Set up subprojects
> > #
> > spice_common = subproject('spice-common', default_options :
> > ['generate-code=client'])
> >
> > spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
> > spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
> >
> > +subproject('keycodemapdb', required : false)
>
> Why required is false? I don't think spice-gtk will compile
> without it.
I don't remember adding that, please remove if you commit.
--
Marc-André Lureau
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
>
> From: Marc-André Lureau
>
> Follow meson build system conventions.
>
> This will allow meson to handle it as a subproject.
>
> Signed-off-by: Marc-André Lureau
> ---
> Changes since v1:
> - rebase;
> - support still Autoconf.
> ---
> .gitmodules | 4 ++--
> meson.build | 6 +-
> src/Makefile.am | 20 ++--
> src/meson.build | 2 --
> {src => subprojects}/keycodemapdb | 0
> 5 files changed, 17 insertions(+), 15 deletions(-)
> rename {src => subprojects}/keycodemapdb (100%)
>
> diff --git a/.gitmodules b/.gitmodules
> index 6938cd0c..a7804e6f 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -1,6 +1,6 @@
> [submodule "spice-common"]
> path = subprojects/spice-common
> url = ../spice-common.git
> -[submodule "src/keycodemapdb"]
> - path = src/keycodemapdb
> +[submodule "subprojects/keycodemapdb"]
> + path = subprojects/keycodemapdb
> url = https://gitlab.com/keycodemap/keycodemapdb.git
> diff --git a/meson.build b/meson.build
> index 1276fb95..9fa94fc4 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -38,12 +38,16 @@ spice_gtk_deps = []
> spice_acl_deps = []
>
> #
> -# Spice common subproject
> +# Set up subprojects
> #
> spice_common = subproject('spice-common', default_options :
> ['generate-code=client'])
>
> spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
> spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
>
> +subproject('keycodemapdb', required : false)
Why required is false? I don't think spice-gtk will compile
without it.
Frediano
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel
[Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
From: Marc-André Lureau
Follow meson build system conventions.
This will allow meson to handle it as a subproject.
Signed-off-by: Marc-André Lureau
---
Changes since v1:
- rebase;
- support still Autoconf.
---
.gitmodules | 4 ++--
meson.build | 6 +-
src/Makefile.am | 20 ++--
src/meson.build | 2 --
{src => subprojects}/keycodemapdb | 0
5 files changed, 17 insertions(+), 15 deletions(-)
rename {src => subprojects}/keycodemapdb (100%)
diff --git a/.gitmodules b/.gitmodules
index 6938cd0c..a7804e6f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "spice-common"]
path = subprojects/spice-common
url = ../spice-common.git
-[submodule "src/keycodemapdb"]
- path = src/keycodemapdb
+[submodule "subprojects/keycodemapdb"]
+ path = subprojects/keycodemapdb
url = https://gitlab.com/keycodemap/keycodemapdb.git
diff --git a/meson.build b/meson.build
index 1276fb95..9fa94fc4 100644
--- a/meson.build
+++ b/meson.build
@@ -38,12 +38,16 @@ spice_gtk_deps = []
spice_acl_deps = []
#
-# Spice common subproject
+# Set up subprojects
#
spice_common = subproject('spice-common', default_options :
['generate-code=client'])
spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
+subproject('keycodemapdb', required : false)
+keymapgen = files('subprojects/keycodemapdb/tools/keymap-gen')
+keymapcsv = files('subprojects/keycodemapdb/data/keymaps.csv')
+
#
# check for system headers
#
diff --git a/src/Makefile.am b/src/Makefile.am
index a9617d47..cdc4d288 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,8 +63,8 @@ GTK_SYMBOLS_LDFLAGS = -export-symbols
${srcdir}/spice-gtk-sym-file
GTK_SYMBOLS_FILE = spice-gtk-sym-file
endif
-KEYMAP_GEN = keycodemapdb/tools/keymap-gen
-KEYMAP_CSV = keycodemapdb/data/keymaps.csv
+KEYMAP_GEN = $(top_srcdir)/subprojects/keycodemapdb/tools/keymap-gen
+KEYMAP_CSV = $(top_srcdir)/subprojects/keycodemapdb/data/keymaps.csv
SPICE_COMMON_CPPFLAGS =\
-DSPICE_COMPILATION \
@@ -471,28 +471,28 @@ spice-widget-enums.h: spice-widget.h
vncdisplaykeymap.c: $(KEYMAPS)
-$(KEYMAPS): $(srcdir)/$(KEYMAP_GEN) $(srcdir)/$(KEYMAP_CSV)
+$(KEYMAPS): $(KEYMAP_GEN) $(KEYMAP_CSV)
vncdisplaykeymap_xorgevdev2xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgevdev2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgevdev xtkbd > $@ ||
rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgevdev2xtkbd code-map $(KEYMAP_CSV) xorgevdev xtkbd > $@ || rm $@
vncdisplaykeymap_xorgkbd2xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgkbd2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgkbd xtkbd > $@ || rm
$@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgkbd2xtkbd code-map $(KEYMAP_CSV) xorgkbd xtkbd > $@ || rm $@
vncdisplaykeymap_xorgxquartz2xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgxquartz2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgxquartz xtkbd >
$@ || rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgxquartz2xtkbd code-map $(KEYMAP_CSV) xorgxquartz xtkbd > $@ || rm $@
vncdisplaykeymap_xorgxwin2xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgxwin2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgxwin xtkbd > $@ ||
rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgxwin2xtkbd code-map $(KEYMAP_CSV) xorgxwin xtkbd > $@ || rm $@
vncdisplaykeymap_osx2xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_osx2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) osx xtkbd > $@ || rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_osx2xtkbd code-map $(KEYMAP_CSV) osx xtkbd > $@ || rm $@
vncdisplaykeymap_win322xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_win322xtkbd code-map $(srcdir)/$(KEYMAP_CSV) win32 xtkbd > $@ || rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_win322xtkbd code-map $(KEYMAP_CSV) win32 xtkbd > $@ || rm $@
vncdisplaykeymap_x112xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_x112xtkbd code-map $(srcdir)/$(KEYMAP_CSV) x11 xtkbd > $@ || rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_x112xtkbd code-map $(KEYMAP_CSV) x11 xtkbd > $@ || rm $@
-include $(INTROSPECTION_MAKEFILE)
diff --git a/src/meson.build b/src/meson.build
index 92179553..5365f054 100644
--- a/src/meson.build
+++ b/src/meson.build
@@
[Spice-devel] [PATCH spice-gtk v2] Move src/keycodemapdb -> subprojects/keycodemapdb
From: Marc-André Lureau
Follow meson build system conventions.
This will allow meson to handle it as a subproject.
Signed-off-by: Marc-André Lureau
---
Changes since v1:
- rebase;
- support still Autoconf.
---
.gitmodules | 4 ++--
meson.build | 6 +-
src/Makefile.am | 20 ++--
src/meson.build | 2 --
{src => subprojects}/keycodemapdb | 0
5 files changed, 17 insertions(+), 15 deletions(-)
rename {src => subprojects}/keycodemapdb (100%)
diff --git a/.gitmodules b/.gitmodules
index 6938cd0c..a7804e6f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "spice-common"]
path = subprojects/spice-common
url = ../spice-common.git
-[submodule "src/keycodemapdb"]
- path = src/keycodemapdb
+[submodule "subprojects/keycodemapdb"]
+ path = subprojects/keycodemapdb
url = https://gitlab.com/keycodemap/keycodemapdb.git
diff --git a/meson.build b/meson.build
index 1276fb95..9fa94fc4 100644
--- a/meson.build
+++ b/meson.build
@@ -38,12 +38,16 @@ spice_gtk_deps = []
spice_acl_deps = []
#
-# Spice common subproject
+# Set up subprojects
#
spice_common = subproject('spice-common', default_options :
['generate-code=client'])
spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
+subproject('keycodemapdb', required : false)
+keymapgen = files('subprojects/keycodemapdb/tools/keymap-gen')
+keymapcsv = files('subprojects/keycodemapdb/data/keymaps.csv')
+
#
# check for system headers
#
diff --git a/src/Makefile.am b/src/Makefile.am
index a9617d47..cdc4d288 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,8 +63,8 @@ GTK_SYMBOLS_LDFLAGS = -export-symbols
${srcdir}/spice-gtk-sym-file
GTK_SYMBOLS_FILE = spice-gtk-sym-file
endif
-KEYMAP_GEN = keycodemapdb/tools/keymap-gen
-KEYMAP_CSV = keycodemapdb/data/keymaps.csv
+KEYMAP_GEN = $(top_srcdir)/subprojects/keycodemapdb/tools/keymap-gen
+KEYMAP_CSV = $(top_srcdir)/subprojects/keycodemapdb/data/keymaps.csv
SPICE_COMMON_CPPFLAGS =\
-DSPICE_COMPILATION \
@@ -471,28 +471,28 @@ spice-widget-enums.h: spice-widget.h
vncdisplaykeymap.c: $(KEYMAPS)
-$(KEYMAPS): $(srcdir)/$(KEYMAP_GEN) $(srcdir)/$(KEYMAP_CSV)
+$(KEYMAPS): $(KEYMAP_GEN) $(KEYMAP_CSV)
vncdisplaykeymap_xorgevdev2xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgevdev2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgevdev xtkbd > $@ ||
rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgevdev2xtkbd code-map $(KEYMAP_CSV) xorgevdev xtkbd > $@ || rm $@
vncdisplaykeymap_xorgkbd2xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgkbd2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgkbd xtkbd > $@ || rm
$@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgkbd2xtkbd code-map $(KEYMAP_CSV) xorgkbd xtkbd > $@ || rm $@
vncdisplaykeymap_xorgxquartz2xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgxquartz2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgxquartz xtkbd >
$@ || rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgxquartz2xtkbd code-map $(KEYMAP_CSV) xorgxquartz xtkbd > $@ || rm $@
vncdisplaykeymap_xorgxwin2xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgxwin2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) xorgxwin xtkbd > $@ ||
rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_xorgxwin2xtkbd code-map $(KEYMAP_CSV) xorgxwin xtkbd > $@ || rm $@
vncdisplaykeymap_osx2xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_osx2xtkbd code-map $(srcdir)/$(KEYMAP_CSV) osx xtkbd > $@ || rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_osx2xtkbd code-map $(KEYMAP_CSV) osx xtkbd > $@ || rm $@
vncdisplaykeymap_win322xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_win322xtkbd code-map $(srcdir)/$(KEYMAP_CSV) win32 xtkbd > $@ || rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_win322xtkbd code-map $(KEYMAP_CSV) win32 xtkbd > $@ || rm $@
vncdisplaykeymap_x112xtkbd.h:
- $(AM_V_GEN)$(PYTHON) $(srcdir)/$(KEYMAP_GEN) --lang glib2 --varname
keymap_x112xtkbd code-map $(srcdir)/$(KEYMAP_CSV) x11 xtkbd > $@ || rm $@
+ $(AM_V_GEN)$(PYTHON) $(KEYMAP_GEN) --lang glib2 --varname
keymap_x112xtkbd code-map $(KEYMAP_CSV) x11 xtkbd > $@ || rm $@
-include $(INTROSPECTION_MAKEFILE)
diff --git a/src/meson.build b/src/meson.build
index 92179553..5365f054 100644
--- a/src/meson.build
+++ b/src/meson.build
@@
