From nobody Mon Feb 9 20:32:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580236081033644.363026627922; Tue, 28 Jan 2020 10:28:01 -0800 (PST) Received: from localhost ([::1]:35164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwVah-0001WC-NQ for importer@patchew.org; Tue, 28 Jan 2020 13:27:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59363) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwV4v-0007kK-H1 for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:55:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwV4t-0001Jt-6N for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:55:09 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:41166) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iwV4s-0001Hc-V0 for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:55:07 -0500 Received: by mail-wr1-x42f.google.com with SMTP id c9so17101842wrw.8 for ; Tue, 28 Jan 2020 09:55:06 -0800 (PST) Received: from localhost.localdomain (93-36-56-206.ip58.fastwebnet.it. [93.36.56.206]) by smtp.gmail.com with ESMTPSA id o4sm27046968wrx.25.2020.01.28.09.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 09:55:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M0HqH7iwd0YbH54NEqXITc/jWWZ/MwBL5OsK9z7h7qk=; b=MPiaiIXR3OD0+xU863/5cB+j84K3JLf4NOYDEUCGg5SeBflQJBs2lhRRR545l/zFC7 w/WhcZO7atPlh/2tbKuz9x6MUosRKsgJiuxGK+8QmTfyTEy+VvzFMS6/LcCHtLkcq6FB u8JHnt/WsNc5O9iypTltpk7fuNQx5ToaBQucAEz5Vrol2K6n+oqp9FNDxI9hscgMKJ7k 0DopDNyYaO8HCN761GxLaOYv+q+kWClv8mj5dwwZZlNL2xp/OFodB46QCChyD03U3GB8 odXLcDTFVle7uKUaukQ4I0Qtx9e/8TXnzitdAtj3sdo/RaGeFPRawKjEcJ1GM9effNKm 9okg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=M0HqH7iwd0YbH54NEqXITc/jWWZ/MwBL5OsK9z7h7qk=; b=p8z83EuPXIqpBY8bIptsQmrsDUG7buWAofH+tH9TpHc5G7w+EtJVgxXA9DbJSN+qxb oMWY/5JfJcwU93rlaS8sPQHgwSLwlAu5VVrdptY8CykQNFJOqJjFt1UfCj2Wt/VhqHgW z+/ZTscFK9xC4DMNnLdXohlEQTPXm8Go1zZF3OSN66PxCCFR6mPsnNBCu/10VgkP+4Sn a9CLGNB0c1PURkOy2ALMGMG0+D1LAXmqmUordkHnYimmMwt6mw0dvXsuM2cSJMy5ASEV +KMpuk4d5QpLS6vChx1HLrs6fHOMzA8nJkiNIz/aX29+NTjz2riqi6i8zJqVG35M//4x pPSA== X-Gm-Message-State: APjAAAWA8t4qT7iWkAC+AMVuHN35CdLdKivH3wuFb9AWDIWeQg0OEcBg /MWlTwaLa2+ntJXcUk6xGC2omfJi X-Google-Smtp-Source: APXvYqwWlZW1qNCPxM8NcCTEMPrCL05qdpv0PfCEl47xCrFkdVm6nGjfbnoI7tcMoQ/kcJhqKH0e+g== X-Received: by 2002:adf:ea51:: with SMTP id j17mr30128441wrn.83.1580234105742; Tue, 28 Jan 2020 09:55:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 032/142] meson: keymap-gen Date: Tue, 28 Jan 2020 18:51:52 +0100 Message-Id: <20200128175342.9066-33-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200128175342.9066-1-pbonzini@redhat.com> References: <20200128175342.9066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 38 -------------------------------------- meson.build | 1 + ui/meson.build | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 38 deletions(-) create mode 100644 ui/meson.build diff --git a/Makefile b/Makefile index 781d3595ae..54249c6fc2 100644 --- a/Makefile +++ b/Makefile @@ -126,44 +126,6 @@ generated-files-y +=3D module_block.h =20 generated-files-y +=3D .git-submodule-status =20 -KEYCODEMAP_GEN =3D $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen -KEYCODEMAP_CSV =3D $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv - -KEYCODEMAP_FILES =3D \ - ui/input-keymap-atset1-to-qcode.c \ - ui/input-keymap-linux-to-qcode.c \ - ui/input-keymap-qcode-to-atset1.c \ - ui/input-keymap-qcode-to-atset2.c \ - ui/input-keymap-qcode-to-atset3.c \ - ui/input-keymap-qcode-to-linux.c \ - ui/input-keymap-qcode-to-qnum.c \ - ui/input-keymap-qcode-to-sun.c \ - ui/input-keymap-qnum-to-qcode.c \ - ui/input-keymap-usb-to-qcode.c \ - ui/input-keymap-win32-to-qcode.c \ - ui/input-keymap-x11-to-qcode.c \ - ui/input-keymap-xorgevdev-to-qcode.c \ - ui/input-keymap-xorgkbd-to-qcode.c \ - ui/input-keymap-xorgxquartz-to-qcode.c \ - ui/input-keymap-xorgxwin-to-qcode.c \ - ui/input-keymap-osx-to-qcode.c \ - $(NULL) - -generated-files-$(CONFIG_SOFTMMU) +=3D $(KEYCODEMAP_FILES) - -ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Ma= kefile.objs - $(call quiet-command,\ - stem=3D$* && src=3D$${stem%-to-*} dst=3D$${stem#*-to-} && \ - test -e $(KEYCODEMAP_GEN) && \ - $(PYTHON) $(KEYCODEMAP_GEN) \ - --lang glib2 \ - --varname qemu_input_map_$${src}_to_$${dst} \ - code-map $(KEYCODEMAP_CSV) $${src} $${dst} \ - > $@ || rm -f $@, "GEN", "$@") - -$(KEYCODEMAP_GEN): .git-submodule-status -$(KEYCODEMAP_CSV): .git-submodule-status - edk2-decompressed =3D $(basename $(wildcard pc-bios/edk2-*.fd.bz2)) pc-bios/edk2-%.fd: pc-bios/edk2-%.fd.bz2 $(call quiet-command,bzip2 -d -c $< > $@,"BUNZIP2",$<) diff --git a/meson.build b/meson.build index 9029821028..5cde258529 100644 --- a/meson.build +++ b/meson.build @@ -227,6 +227,7 @@ subdir('stubs') subdir('trace') subdir('util') subdir('crypto') +subdir('ui') =20 # Build targets from sourcesets =20 diff --git a/ui/meson.build b/ui/meson.build new file mode 100644 index 0000000000..cad97635d8 --- /dev/null +++ b/ui/meson.build @@ -0,0 +1,34 @@ +keymap_gen =3D find_program('keycodemapdb/tools/keymap-gen') + +keymaps =3D [ + ['atset1', 'qcode'], + ['linux', 'qcode'], + ['qcode', 'atset1'], + ['qcode', 'atset2'], + ['qcode', 'atset3'], + ['qcode', 'linux'], + ['qcode', 'qnum'], + ['qcode', 'sun'], + ['qnum', 'qcode'], + ['usb', 'qcode'], + ['win32', 'qcode'], + ['x11', 'qcode'], + ['xorgevdev', 'qcode'], + ['xorgkbd', 'qcode'], + ['xorgxquartz', 'qcode'], + ['xorgxwin', 'qcode'], + ['osx', 'qcode'], +] + +foreach e : keymaps + output =3D 'input-keymap-@0@-to-@1@.c'.format(e[0], e[1]) + custom_target(output, + output: output, + capture: true, + build_by_default: true, # to be removed when added to a ta= rget + input: files('keycodemapdb/data/keymaps.csv'), + command: [keymap_gen, + '--lang', 'glib2', + '--varname', 'qemu_input_map_@0@_to_@1@'.format(= e[0], e[1]), + 'code-map', '@INPUT0@', e[0], e[1]]) +endforeach --=20 2.21.0