[Spice-commits] .gitmodules meson.build src/keycodemapdb src/Makefile.am src/meson.build subprojects/keycodemapdb

[GitLab Mirror]

 .gitmodules              |    4 ++--
 meson.build              |    6 +++++-
 src/Makefile.am          |   20 ++++++++++----------
 src/keycodemapdb         |    1 -
 src/meson.build          |    2 --
 subprojects/keycodemapdb |    1 +
 6 files changed, 18 insertions(+), 16 deletions(-)

New commits:
commit 184e72167c4e1e34af19d948f401c0a04b9f0332
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Fri Jan 18 04:16:11 2019 +0400

    Move src/keycodemapdb -> subprojects/keycodemapdb
    
    Follow meson build system conventions.
    
    This will allow meson to handle it as a subproject.
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/.gitmodules b/.gitmodules
index 6938cd0..e39c69f 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 "keycodemapdb"]
+	path = subprojects/keycodemapdb
 	url = https://gitlab.com/keycodemap/keycodemapdb.git
diff --git a/meson.build b/meson.build
index 1276fb9..c015de7 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')
+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 a9617d4..cdc4d28 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/keycodemapdb b/src/keycodemapdb
deleted file mode 160000
index 16e5b07..0000000
--- a/src/keycodemapdb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 16e5b0787687d8904dad2c026107409eb9bfcb95
diff --git a/src/meson.build b/src/meson.build
index 9217955..5365f05 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -287,8 +287,6 @@ if spice_gtk_has_gtk
 
   # keymaps
   python = import('python').find_installation()
-  keymapgen = files('./keycodemapdb/tools/keymap-gen')
-  keymapcsv = files('./keycodemapdb/data/keymaps.csv')
   keymaps = ['xorgevdev',
              'xorgkbd',
              'xorgxquartz',
diff --git a/subprojects/keycodemapdb b/subprojects/keycodemapdb
new file mode 160000
index 0000000..df4e56f
--- /dev/null
+++ b/subprojects/keycodemapdb
@@ -0,0 +1 @@
+Subproject commit df4e56f8fab65ba714ec18f4e7338a966a1620ad