From nobody Tue Dec 16 08:32:07 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597080454; cv=none; d=zohomail.com; s=zohoarc; b=DxHfnBHODGqcN1YgQ/jXtgoP1ro6RJdAyY/Q+DaX0QlsfMGO4VzHBF8ZQvsybvPxAaOFRBJY0xJ9nI2wVvw+uY+gz3cUsj72uud6K0sLboCoSjH+zokfqxd2aaSnf6714Ukqqapk+8SW+rOFhWG/pzhQU6u2o+L5xIi9MaXSEKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597080454; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k+TbutJ84oJkp/r4ElUEfmom1VA5P+5q0XqZoziFg2o=; b=kmLQJPdeeqLkuHGK8mSxvIxNnEN84SvI5RJ7Ij01XSZdwoGj13r03FFPugE1RJ1A/dVZ06KY3pMX6y1GIvXABGU83G5vtPivrWGK31rhFXWPcX4uJWk5BD9F/L1GHFD0Uqx+dVbNyFYin0fD0lcfN297aHdJTD/Oj9ea/jAPq4U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597080454427293.62272383865445; Mon, 10 Aug 2020 10:27:34 -0700 (PDT) Received: from localhost ([::1]:60490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5Ba9-00088v-11 for importer@patchew.org; Mon, 10 Aug 2020 13:27:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BJd-0007ni-Eu for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54201 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BJa-0002rt-Ul for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:10:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-386-l0ztJc2CPtykhG_eGI6X6Q-1; Mon, 10 Aug 2020 13:10:24 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D9DE8014D7 for ; Mon, 10 Aug 2020 17:10:23 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3B6987D61; Mon, 10 Aug 2020 17:10:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k+TbutJ84oJkp/r4ElUEfmom1VA5P+5q0XqZoziFg2o=; b=fLYHqn4U1ZDZoW1GFztd82DPp1uE0WdAA9ehU/rY6gQ7AiIkarlTEIO6MZ2fTY9M/X434O s4az80JgdOFYUQ2+s2X09e9EeuAtauSv744pyI508zmDc+o09gDFCmAIB3CKOopu5Yp//b tWC9zMr4buFktgpiLMjmiUQfBXmaRNQ= X-MC-Unique: l0ztJc2CPtykhG_eGI6X6Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 044/147] meson: keymap-gen Date: Mon, 10 Aug 2020 19:07:22 +0200 Message-Id: <1597079345-42801-45-git-send-email-pbonzini@redhat.com> In-Reply-To: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> References: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: pass (identity @redhat.com) 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 f4e5ecf..d5e43a0 100644 --- a/Makefile +++ b/Makefile @@ -125,44 +125,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.inc \ - ui/input-keymap-linux-to-qcode.inc \ - ui/input-keymap-qcode-to-atset1.inc \ - ui/input-keymap-qcode-to-atset2.inc \ - ui/input-keymap-qcode-to-atset3.inc \ - ui/input-keymap-qcode-to-linux.inc \ - ui/input-keymap-qcode-to-qnum.inc \ - ui/input-keymap-qcode-to-sun.inc \ - ui/input-keymap-qnum-to-qcode.inc \ - ui/input-keymap-usb-to-qcode.inc \ - ui/input-keymap-win32-to-qcode.inc \ - ui/input-keymap-x11-to-qcode.inc \ - ui/input-keymap-xorgevdev-to-qcode.inc \ - ui/input-keymap-xorgkbd-to-qcode.inc \ - ui/input-keymap-xorgxquartz-to-qcode.inc \ - ui/input-keymap-xorgxwin-to-qcode.inc \ - ui/input-keymap-osx-to-qcode.inc \ - $(NULL) - -generated-files-$(CONFIG_SOFTMMU) +=3D $(KEYCODEMAP_FILES) - -ui/input-keymap-%.inc: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/= Makefile.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 d71d87d..4ea7fbb 100644 --- a/meson.build +++ b/meson.build @@ -271,6 +271,7 @@ subdir('trace') subdir('util') subdir('crypto') subdir('storage-daemon') +subdir('ui') =20 # Build targets from sourcesets =20 diff --git a/ui/meson.build b/ui/meson.build new file mode 100644 index 0000000..daacd2f --- /dev/null +++ b/ui/meson.build @@ -0,0 +1,34 @@ +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'], +] + +if have_system + foreach e : keymaps + output =3D 'input-keymap-@0@-to-@1@.inc'.format(e[0], e[1]) + genh +=3D custom_target(output, + output: output, + capture: true, + build_by_default: true, # to be removed when added to a = target + input: files('keycodemapdb/data/keymaps.csv'), + command: [python.full_path(), files('keycodemapdb/tools/= keymap-gen'), + '--lang', 'glib2', + '--varname', 'qemu_input_map_@0@_to_@1@'.forma= t(e[0], e[1]), + 'code-map', '@INPUT0@', e[0], e[1]]) + endforeach +endif --=20 1.8.3.1