motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: use subproject for keycodemapdb

Browse source 
By using a subproject, our own meson.build can use variables from
the subproject instead of hard-coded paths.  This is also the first step
towards managing downloads with .wrap files instead of submodule.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-05-18 12:07:22 +00:00
parent 58e48b2e72
commit c53648abba
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -25,8 +25,8 @@
[submodule "roms/QemuMacDrivers"] [submodule "roms/QemuMacDrivers"]
path = roms/QemuMacDrivers path = roms/QemuMacDrivers
url = https://gitlab.com/qemu-project/QemuMacDrivers.git url = https://gitlab.com/qemu-project/QemuMacDrivers.git
[submodule "ui/keycodemapdb"] [submodule "subprojects/keycodemapdb"]
path = ui/keycodemapdb path = subprojects/keycodemapdb
url = https://gitlab.com/qemu-project/keycodemapdb.git url = https://gitlab.com/qemu-project/keycodemapdb.git
[submodule "roms/seabios-hppa"] [submodule "roms/seabios-hppa"]
path = roms/seabios-hppa path = roms/seabios-hppa

4
configure vendored
View file

@ -253,7 +253,7 @@ else
git_submodules_action="ignore" git_submodules_action="ignore"
fi fi
git_submodules="ui/keycodemapdb" git_submodules="subprojects/keycodemapdb"
git="git" git="git"
debug_tcg="no" debug_tcg="no"
docs="auto" docs="auto"
@ -805,7 +805,7 @@ case $git_submodules_action in
fi fi
;; ;;
ignore) ignore)
if ! test -f "$source_path/ui/keycodemapdb/README" if ! test -f "$source_path/subprojects/keycodemapdb/README"
then then
echo echo
echo "ERROR: missing GIT submodules" echo "ERROR: missing GIT submodules"

2
scripts/archive-source.sh
View file

@ -26,7 +26,7 @@ sub_file="${sub_tdir}/submodule.tar"
# independent of what the developer currently has initialized # independent of what the developer currently has initialized
# in their checkout, because the build environment is completely # in their checkout, because the build environment is completely
# different to the host OS. # different to the host OS.
submodules="subprojects/dtc ui/keycodemapdb" submodules="subprojects/dtc subprojects/keycodemapdb"
submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3"
sub_deinit="" sub_deinit=""

0
ui/keycodemapdb → subprojects/keycodemapdb
View file

8
ui/meson.build
View file

@ -162,15 +162,15 @@ keymaps = [
] ]
if have_system or xkbcommon.found() if have_system or xkbcommon.found()
keycodemapdb_proj = subproject('keycodemapdb', required: true)
foreach e : keymaps foreach e : keymaps
output = 'input-keymap-@0@-to-@1@.c.inc'.format(e[0], e[1]) output = 'input-keymap-@0@-to-@1@.c.inc'.format(e[0], e[1])
genh += custom_target(output, genh += custom_target(output,
output: output, output: output,
capture: true, capture: true,
input: files('keycodemapdb/data/keymaps.csv'), input: keycodemapdb_proj.get_variable('keymaps_csv'),
command: [python, files('keycodemapdb/tools/keymap-gen'), command: [python, keycodemapdb_proj.get_variable('keymap_gen').full_path(),
'code-map', 'code-map', '--lang', 'glib2',
'--lang', 'glib2',
'--varname', 'qemu_input_map_@0@_to_@1@'.format(e[0], e[1]), '--varname', 'qemu_input_map_@0@_to_@1@'.format(e[0], e[1]),
'@INPUT0@', e[0], e[1]]) '@INPUT0@', e[0], e[1]])
endforeach endforeach