From nobody Sun May 19 04:56:00 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1598378376; cv=none; d=zohomail.com; s=zohoarc; b=kKrBeSvXEbJrfL8GMzJfQIbmx37cys0Ubeog8QjRIqSOOzmilW1pNvAlYaGNSMLJ7o7r5f5nuqnJdMYZ09g/0MqcGCKln9b2C+kC3VO95RGzL7MMsK0HGLIQnSgr4gTt7NYm8/sgz5xk+XH4BOhfYQdeqlXxeOUqJUPYPUCFa+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598378376; 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=6co6dqqFbt+M+9vp8wQuYLG4bX1PgrCFXyEUrd8kagY=; b=X3xgFtdms/WATAgk5PczFr/e5U/+1TbbFr16zqgPVs/kOrXDqhvagkDAHfnEsTTE0SbEl1CLWTxWzK7dPcHrUmSSvOJWTikirfmS9pAgsgZsPcNfJjFkWQ7dXfHzRz6ejBrw/p297+1qTA2nflmY7oqSysT4336lqGMKaAmdtsA= ARC-Authentication-Results: i=1; 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 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 1598378376417667.03517537757; Tue, 25 Aug 2020 10:59:36 -0700 (PDT) Received: from localhost ([::1]:49198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAdEM-0000ed-T7 for importer@patchew.org; Tue, 25 Aug 2020 13:59:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAdDb-0007z9-Vr for qemu-devel@nongnu.org; Tue, 25 Aug 2020 13:58:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24730 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 1kAdDa-0003Qv-1e for qemu-devel@nongnu.org; Tue, 25 Aug 2020 13:58:47 -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-291-ddvPdwPmO3uX0ia9HGIVQA-1; Tue, 25 Aug 2020 13:58:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E1FE1DDE0; Tue, 25 Aug 2020 17:58:42 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4BBC25D9D3; Tue, 25 Aug 2020 17:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598378324; 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=6co6dqqFbt+M+9vp8wQuYLG4bX1PgrCFXyEUrd8kagY=; b=hC558ciSjjU+tlWgu4xFENDp1kZOBOZkUXYxOM/Pbbu1TNbxWbBuAYLW+O7b34DwFe1/0g kupSht9FmXGw2bVHaQ38+jzePsocS6bzo2hwOJKxRXzVxW39hS5WF5YN8cZSUFoENJ8YDc JsLrxv34t+BCl+SbmQsicNYaEyB/35s= X-MC-Unique: ddvPdwPmO3uX0ia9HGIVQA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v2 1/5] meson: pass confsuffix option Date: Tue, 25 Aug 2020 21:58:23 +0400 Message-Id: <20200825175827.355940-2-marcandre.lureau@redhat.com> In-Reply-To: <20200825175827.355940-1-marcandre.lureau@redhat.com> References: <20200825175827.355940-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 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=207.211.31.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:37:44 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=-0.958, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com 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 The following patches will make use of it to fix installation paths. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 1 + meson_options.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index b1e11397a8..e19e2de2f0 100755 --- a/configure +++ b/configure @@ -8222,6 +8222,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ --mandir "${pre_prefix}$mandir" \ --sysconfdir "${pre_prefix}$sysconfdir" \ --localstatedir "${pre_prefix}$local_statedir" \ + -Dconfsuffix=3D"$confsuffix" \ -Doptimization=3D$(if test "$debug" =3D yes; then echo 0; else ech= o 2; fi) \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ diff --git a/meson_options.txt b/meson_options.txt index c55f9cd94c..7bb2c0fca9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('confsuffix', type : 'string', value: 'qemu') option('gettext', type : 'boolean', value : true) option('sdl', type : 'feature', value : 'auto') option('sdl_image', type : 'feature', value : 'auto') --=20 2.26.2 From nobody Sun May 19 04:56:00 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1598378568; cv=none; d=zohomail.com; s=zohoarc; b=WqJDg2Jz187y9VrPkRYGvLSZBfmlNZnUN4JOFm0SbQHnuTFu63mTeHPpGe6d/C3ui8gwDrntYXpYlTTIC6CKr6oMyqwIPJLEivG4PGWxFejK9aIVZy4OZXTef/Q45wOp9HaeeVkMAuKfcjmAnLJUn8mQFjGkejaj//2Jv70V26w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598378568; 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=zrB6eiMbxp32SBkm8uz7db0X+q445dB/jQqAAccAcZY=; b=e7khfbqmAebobJFNGmbpSRVpAk9GMC7sXkAbkalnRYQ/CmMCx0qUcMa07bycwJF1irU9NpIERKhJTMzdoq9voDIs/GLl9Sh1Fz8yDmSE2M8cL58lEiw4lGh/aGPMxfwcl+2MgPgJPV67Wsu7ujG/By1j509AVvCYhQx2Ce/kBnM= ARC-Authentication-Results: i=1; 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 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 1598378568258323.818200161607; Tue, 25 Aug 2020 11:02:48 -0700 (PDT) Received: from localhost ([::1]:58918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAdHS-0004hz-Uc for importer@patchew.org; Tue, 25 Aug 2020 14:02:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAdDm-0008HN-L6 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 13:58:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46842) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAdDk-0003SV-Rj for qemu-devel@nongnu.org; Tue, 25 Aug 2020 13:58:58 -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-378-c5Dy4VhmPdOaTfGdua117g-1; Tue, 25 Aug 2020 13:58:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4F7D81F01A; Tue, 25 Aug 2020 17:58:49 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id D914419144; Tue, 25 Aug 2020 17:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598378335; 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=zrB6eiMbxp32SBkm8uz7db0X+q445dB/jQqAAccAcZY=; b=Ryq4XiQPm2PQKF16+LzuSbX0IwBCcg/rJ4Oa9MU84kiWq2qrjFxhhHex2UDh7UmWffvhDD uaZLFJyeekmtQVfr4aMKGI+MBu6Qqx1ynqLdY1pOuslDtPgpAzUqrXYN1zlkclqE33OVHI QGa1v7xR5XKa5+aAvzdgVb+jYywhYL4= X-MC-Unique: c5Dy4VhmPdOaTfGdua117g-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v2 2/5] meson: use meson datadir instead of qemu_datadir Date: Tue, 25 Aug 2020 21:58:24 +0400 Message-Id: <20200825175827.355940-3-marcandre.lureau@redhat.com> In-Reply-To: <20200825175827.355940-1-marcandre.lureau@redhat.com> References: <20200825175827.355940-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 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=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 06:38:59 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=-0.958, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com 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 When cross-compiling, by default qemu_datadir is 'c:\Program Files\QEMU', which is not recognized as being an absolute path, and meson will end up adding the prefix again. Signed-off-by: Marc-Andr=C3=A9 Lureau --- contrib/vhost-user-gpu/meson.build | 2 +- meson.build | 3 ++- pc-bios/descriptors/meson.build | 2 +- pc-bios/keymaps/meson.build | 6 +++--- pc-bios/meson.build | 2 +- tools/virtiofsd/meson.build | 2 +- trace/meson.build | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build index 6c1459f54a..8df4c13bc5 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -9,5 +9,5 @@ if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in conf= ig_host \ configure_file(input: '50-qemu-gpu.json.in', output: '50-qemu-gpu.json', configuration: config_host, - install_dir: config_host['qemu_datadir'] / 'vhost-user') + install_dir: qemu_datadir / 'vhost-user') endif diff --git a/meson.build b/meson.build index f0fe5f8799..20f20a7bfc 100644 --- a/meson.build +++ b/meson.build @@ -17,6 +17,7 @@ config_all_disas =3D keyval.load(meson.current_build_dir(= ) / 'config-all-disas.mak enable_modules =3D 'CONFIG_MODULES' in config_host enable_static =3D 'CONFIG_STATIC' in config_host build_docs =3D 'BUILD_DOCS' in config_host +qemu_datadir =3D get_option('datadir') + get_option('confsuffix') config_host_data =3D configuration_data() genh =3D [] =20 @@ -1039,7 +1040,7 @@ foreach target : target_dirs output: exe_name + stp['ext'], capture: true, install: stp['install'], - install_dir: config_host['qemu_datadir'] / '../syste= mtap/tapset', + install_dir: qemu_datadir / '../systemtap/tapset', command: [ tracetool, '--group=3Dall', '--format=3D' + stp['f= mt'], '--binary=3D' + stp['bin'], diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.bu= ild index 7c715bace8..3798d32372 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -10,5 +10,5 @@ foreach f: [ output: f, configuration: {'DATADIR': config_host['qemu_datadir']}, install: install_blobs, - install_dir: config_host['qemu_datadir'] / 'firmware') + install_dir: qemu_datadir / 'firmware') endforeach diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index b737c82230..bbac83ece3 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -44,13 +44,13 @@ foreach km, args: keymaps build_by_default: true, output: km, command: [native_qemu_keymap, '-f', '@OUTPUT@', args.= split()], - install_dir: config_host['qemu_datadir'] / 'keymaps') + install_dir: qemu_datadir / 'keymaps') endforeach if t.length() > 0 alias_target('update-keymaps', t) else # install from the source tree - install_data(keymaps.keys(), install_dir: config_host['qemu_datadir'] / = 'keymaps') + install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps') endif =20 -install_data(['sl', 'sv'], install_dir: config_host['qemu_datadir'] / 'key= maps') +install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') diff --git a/pc-bios/meson.build b/pc-bios/meson.build index b6389f5148..c11e52ba26 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -19,7 +19,7 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host input: '@0@.bz2'.format(f), capture: true, install: install_blobs, - install_dir: config_host['qemu_datadir'], + install_dir: qemu_datadir, command: [ bzip2, '-dc', '@INPUT0@' ]) endforeach endif diff --git a/tools/virtiofsd/meson.build b/tools/virtiofsd/meson.build index d1e23c5760..50022ed89e 100644 --- a/tools/virtiofsd/meson.build +++ b/tools/virtiofsd/meson.build @@ -16,4 +16,4 @@ executable('virtiofsd', files( configure_file(input: '50-qemu-virtiofsd.json.in', output: '50-qemu-virtiofsd.json', configuration: config_host, - install_dir: config_host['qemu_datadir'] / 'vhost-user') + install_dir: qemu_datadir / 'vhost-user') diff --git a/trace/meson.build b/trace/meson.build index 56e870848e..5f0bf11cb5 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -55,7 +55,7 @@ trace_events_all =3D custom_target('trace-events-all', command: [ 'cat', '@INPUT@' ], capture: true, install: true, - install_dir: config_host['qemu_datadir']) + install_dir: qemu_datadir) =20 foreach d : [ ['generated-tcg-tracers.h', 'tcg-h'], --=20 2.26.2 From nobody Sun May 19 04:56:00 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1598378411; cv=none; d=zohomail.com; s=zohoarc; b=BOQAym/kd+suWBqoOY+2RbKSgdkUIeAj91f2z9OIXcmo1i4Ojq5z5zVkxlvAbcAjB/9YZ4CKjCGADdEMGMWJp5NMLw0gE8eiKaoLMoJOIV6NJ8MBSlWarbvmjJibRlooxKBXCC5IKxr3mtxYItfBJTNlg7WZDGZAMlrYryrSQ3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598378411; 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=408pICv+ubcqoi+Lk7I4/D0jqt+4yOugK8fHMuPjHi4=; b=L/KAUHUwGkqONsPsvBSGxRu8ed/SJvr6lFAF0Ltn3+6lpXXfjDQnFBdO4Glhu6j3lpCMQ3ppQH/LyxFr4yhqBg5OyxiRNuMEXJX5D9UwPAWynUCKcHRypuo3kkhWN4lzMBHBq+3gKrSIkT2JeFypu1+RkXh5GVQvkj3fd22VdHQ= ARC-Authentication-Results: i=1; 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 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 1598378411234812.0047951156293; Tue, 25 Aug 2020 11:00:11 -0700 (PDT) Received: from localhost ([::1]:51678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAdEv-0001eO-Qu for importer@patchew.org; Tue, 25 Aug 2020 14:00:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAdDs-0008SU-Va for qemu-devel@nongnu.org; Tue, 25 Aug 2020 13:59:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23978) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAdDr-0003T6-4o for qemu-devel@nongnu.org; Tue, 25 Aug 2020 13:59:04 -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-36-kiee9qI9Pn25aNVQU3QrHw-1; Tue, 25 Aug 2020 13:58:56 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80FEA1007467; Tue, 25 Aug 2020 17:58:55 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C1486FEDC; Tue, 25 Aug 2020 17:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598378342; 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=408pICv+ubcqoi+Lk7I4/D0jqt+4yOugK8fHMuPjHi4=; b=R7n5tZAqc7CQ/c1wt16frsI/FUXRgUNwNnJ91ZKRYmE0SBcJF9IWSOd75YU6nPnsz+AHU1 /m1LdeZzYkVU0XPRfxQOl9yrUy5N4ljR76oMzGYmvxQfYyMwsTebolpoN6dmNjQWROrcUM fZ71da8DByGld1dhUCS5ln1KtigI9vo= X-MC-Unique: kiee9qI9Pn25aNVQU3QrHw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v2 3/5] meson: add docdir option and pass pre-prefix qemu_docdir Date: Tue, 25 Aug 2020 21:58:25 +0400 Message-Id: <20200825175827.355940-4-marcandre.lureau@redhat.com> In-Reply-To: <20200825175827.355940-1-marcandre.lureau@redhat.com> References: <20200825175827.355940-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 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=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 06:38:59 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=-0.958, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com 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 When cross-compiling, by default qemu_docdir is 'c:\Program Files\QEMU\' which is not recognized as being an absolute path, and meson will end up adding the prefix again. Add an option to pass docdir location to meson, pre-prefixed like we do with other directories and use that instead of config_host['qemu_docdir']. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 1 + docs/meson.build | 4 ++-- meson.build | 3 ++- meson_options.txt | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure b/configure index e19e2de2f0..e644841299 100755 --- a/configure +++ b/configure @@ -8223,6 +8223,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ --sysconfdir "${pre_prefix}$sysconfdir" \ --localstatedir "${pre_prefix}$local_statedir" \ -Dconfsuffix=3D"$confsuffix" \ + -Ddocdir=3D"${pre_prefix}$qemu_docdir" \ -Doptimization=3D$(if test "$debug" =3D yes; then echo 0; else ech= o 2; fi) \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ diff --git a/docs/meson.build b/docs/meson.build index 8b059a8e39..e27f4632dc 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -10,7 +10,7 @@ if build_docs configure_file(output: 'index.html', input: files('index.html.in'), configuration: {'VERSION': meson.project_version()}, - install_dir: config_host['qemu_docdir']) + install_dir: get_option('docdir')) manuals =3D [ 'devel', 'interop', 'tools', 'specs', 'system', 'user' ] man_pages =3D { 'interop' : { @@ -48,7 +48,7 @@ if build_docs input_dir, output_dir]) sphinxdocs +=3D this_manual if build_docs and manual !=3D 'devel' - install_subdir(output_dir, install_dir: config_host['qemu_docdir']) + install_subdir(output_dir, install_dir: get_option('docdir')) endif =20 these_man_pages =3D [] diff --git a/meson.build b/meson.build index 20f20a7bfc..33281cecc3 100644 --- a/meson.build +++ b/meson.build @@ -1170,7 +1170,7 @@ if build_docs input: input, output: output, install: true, - install_dir: config_host['qemu_docdir'] / 'interop', + install_dir: get_option('docdir') / 'interop', command: cmd + args) endforeach alias_target(ext, t) @@ -1233,6 +1233,7 @@ if targetos !=3D 'windows' else summary_info +=3D {'local state directory': 'queried at runtime'} endif +summary_info +=3D {'Doc directory': get_option('docdir')} summary_info +=3D {'Build directory': meson.current_build_dir()} summary_info +=3D {'Source path': meson.current_source_dir()} summary_info +=3D {'GIT binary': config_host['GIT']} diff --git a/meson_options.txt b/meson_options.txt index 7bb2c0fca9..fb9312fddd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,5 @@ option('confsuffix', type : 'string', value: 'qemu') +option('docdir', type : 'string', value : 'doc/qemu') option('gettext', type : 'boolean', value : true) option('sdl', type : 'feature', value : 'auto') option('sdl_image', type : 'feature', value : 'auto') --=20 2.26.2 From nobody Sun May 19 04:56:00 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1598378419; cv=none; d=zohomail.com; s=zohoarc; b=bK7m5pHo8qPBxREnVkFmjIBc3+LpGqiBmbwdJP9MPsN8kWp53g8QkGS/BQk8hkU658RC0Zlhgem+vgBwx/5qpgvPkhPwJ7GNOJ2GiQgQLGHFTvc5BodjXckVzLjxlg8UkhfiWUwhPOVwQhZWC7P0UihTVEuspveeXNYabEfwVdI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598378419; 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=voQMKLME5p6u9gW2huG6GbQRmI8Y9rFCBNTU8I1G4TM=; b=nweEvnLz/E/FCUebyf507At1MZ7a0mW022+7416QWi75WBN+hpCxrvMThFgF4NaU5Kkcri11LG+3uy2PUb+65WczRApgL4r3UwQcaHAoPpMfPbT0gN25IJIknDVyZbbPkRFHQWsl6+RTcQO0A7rZZE34dKphCtyfdDO68ZCUdR4= ARC-Authentication-Results: i=1; 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 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 1598378419824548.1893802943648; Tue, 25 Aug 2020 11:00:19 -0700 (PDT) Received: from localhost ([::1]:52416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAdF4-0001wZ-8z for importer@patchew.org; Tue, 25 Aug 2020 14:00:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAdDy-0000Eg-TE for qemu-devel@nongnu.org; Tue, 25 Aug 2020 13:59:10 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37864 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 1kAdDx-0003TV-C6 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 13:59:10 -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-234-SX3fozoyPZmuoyepu3varQ-1; Tue, 25 Aug 2020 13:59:04 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 36D86100746A; Tue, 25 Aug 2020 17:59:03 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F9FB1002D49; Tue, 25 Aug 2020 17:58:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598378348; 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=voQMKLME5p6u9gW2huG6GbQRmI8Y9rFCBNTU8I1G4TM=; b=Fer3h0AHbpEKnFc5drawsD+yp5z9S1gHXlJUJIwGFDSAyzxgv+wx6xnXq0OTCn6txpkj0I dWSEeJgXa2d+t3mwaxA+6B7sDRBGYnxa4cS/U+6DZ8ZX11Iq3G391QMs5VzTkBW0j0+zoi K03n2rOknNUYpMQxiuB1NX+PrTIdEzU= X-MC-Unique: SX3fozoyPZmuoyepu3varQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v2 4/5] meson: use meson mandir instead of qemu_mandir Date: Tue, 25 Aug 2020 21:58:26 +0400 Message-Id: <20200825175827.355940-5-marcandre.lureau@redhat.com> In-Reply-To: <20200825175827.355940-1-marcandre.lureau@redhat.com> References: <20200825175827.355940-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 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=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 10:39:45 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=-0.958, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com 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 When cross-compiling, by default qemu_mandir is 'c:\Program Files\QEMU', which is not recognized as being an absolute path, and meson will end up adding the prefix again. Use the pre-prefixed meson mandir option instead. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 33281cecc3..0720a7d684 100644 --- a/meson.build +++ b/meson.build @@ -1210,7 +1210,7 @@ if build_docs output: man, capture: true, install: true, - install_dir: config_host['mandir'] / 'man7', + install_dir: get_option('mandir') / 'man7', command: [pod2man, '--utf8', '--section=3D7', '-= -center=3D" "', '--release=3D" "', '@INPUT@']) endforeach --=20 2.26.2 From nobody Sun May 19 04:56:00 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1598378549; cv=none; d=zohomail.com; s=zohoarc; b=grvUh83socdlYpfowMdgeCUpMFLSXkOVNwvOJZcy9HKkynjBb+MtE9dW9r4G/uZboanNmEwTjtgT0TkBghFl/s/88P3d+Mz001FNc9jKd4D7UVUewsc/Q5XTZnegyEcHAQXS31WEWV98CrzrukHP/g6YnMBoWdRs5grYDIrAyJ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598378549; 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=9Yht4X/+ViXbgjzJlQR/gjv+vQ6cj6WUvGJ0e7LvyYw=; b=S/Dm4XRRfeVVTXXiDqBcgAh5dukvXPAaGEBKYiRqNrHGwPxBPDqIQgjMZ/NZgeAYGt/NXmbXLF7To59hwe5A6qIH/6zi2Xr/oh0UoEf+bcDrd0Frbx9711pJitgdSKA4u/LEli4MEw6Qus1lM7taQ3HbF4IQ++vKW8K86Ji/XbA= ARC-Authentication-Results: i=1; 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 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 1598378549378421.3021139019206; Tue, 25 Aug 2020 11:02:29 -0700 (PDT) Received: from localhost ([::1]:57322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAdH9-000436-VJ for importer@patchew.org; Tue, 25 Aug 2020 14:02:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAdE4-0000Vg-OP for qemu-devel@nongnu.org; Tue, 25 Aug 2020 13:59:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45221) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAdE2-0003Tr-CT for qemu-devel@nongnu.org; Tue, 25 Aug 2020 13:59:16 -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-551-mVcP5CXUNDSF1TXhXeoDSA-1; Tue, 25 Aug 2020 13:59:09 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDB9D10082E7; Tue, 25 Aug 2020 17:59:08 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9918A1002D48; Tue, 25 Aug 2020 17:59:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598378353; 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=9Yht4X/+ViXbgjzJlQR/gjv+vQ6cj6WUvGJ0e7LvyYw=; b=dGvztryYVqi+WnbkYA4OfiFoANQlGOdYsDOrgKDrpHMChvydeOH/ELY3DMeG0Bw0Ysqj9A R+m1GFHlpKjECL0FOnTcc86/7GNtiNXU951vPBdAv/M/Ik3Z2hQyYIA3UxwO6OHh/Nkop5 RaDq5Dc1SGPpD+jLyyyBrMrvJd334BU= X-MC-Unique: mVcP5CXUNDSF1TXhXeoDSA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v2 5/5] meson: add NSIS building Date: Tue, 25 Aug 2020 21:58:27 +0400 Message-Id: <20200825175827.355940-6-marcandre.lureau@redhat.com> In-Reply-To: <20200825175827.355940-1-marcandre.lureau@redhat.com> References: <20200825175827.355940-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 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=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 02:03:58 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=-0.958, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: sw@weilnetz.de, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- Makefile | 56 ----------------------------------- meson.build | 25 ++++++++++++++++ scripts/nsis.py | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 56 deletions(-) create mode 100644 scripts/nsis.py diff --git a/Makefile b/Makefile index 81794d5c34..3ebd6929b4 100644 --- a/Makefile +++ b/Makefile @@ -294,62 +294,6 @@ endif "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" =20 -ifdef CONFIG_WIN32 - -INSTALLER =3D qemu-setup-$(VERSION)$(EXESUF) - -nsisflags =3D -V2 -NOCD - -ifneq ($(wildcard $(SRC_PATH)/dll),) -ifeq ($(ARCH),x86_64) -# 64 bit executables -DLL_PATH =3D $(SRC_PATH)/dll/w64 -nsisflags +=3D -DW64 -else -# 32 bit executables -DLL_PATH =3D $(SRC_PATH)/dll/w32 -endif -endif - -.PHONY: installer -installer: $(INSTALLER) - -INSTDIR=3D/tmp/qemu-nsis - -$(INSTALLER): $(SRC_PATH)/qemu.nsi - $(MAKE) install DESTDIR=3D${INSTDIR} -ifdef SIGNCODE - (cd ${INSTDIR}/${bindir}; \ - for i in *.exe; do \ - $(SIGNCODE) $${i}; \ - done \ - ) -endif # SIGNCODE - (cd ${INSTDIR}/${bindir}; \ - for i in qemu-system-*.exe; do \ - arch=3D$${i%.exe}; \ - arch=3D$${arch#qemu-system-}; \ - echo Section \"$$arch\" Section_$$arch; \ - echo SetOutPath \"\$$INSTDIR\"; \ - echo File \"\$${BINDIR}\\$$i\"; \ - echo SectionEnd; \ - done \ - ) >${INSTDIR}/${bindir}/system-emulations.nsh - makensis $(nsisflags) \ - $(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION=3D"y") \ - $(if $(CONFIG_GTK),-DCONFIG_GTK=3D"y") \ - -DBINDIR=3D"${INSTDIR}/${bindir}" \ - $(if $(DLL_PATH),-DDLLDIR=3D"$(DLL_PATH)") \ - -DSRCDIR=3D"$(SRC_PATH)" \ - -DOUTFILE=3D"$(INSTALLER)" \ - -DDISPLAYVERSION=3D"$(VERSION)" \ - $(SRC_PATH)/qemu.nsi - rm -r ${INSTDIR} -ifdef SIGNCODE - $(SIGNCODE) $(INSTALLER) -endif # SIGNCODE -endif # CONFIG_WIN - # Add a dependency on the generated files, so that they are always # rebuilt before other object files ifneq ($(wildcard config-host.mak),) diff --git a/meson.build b/meson.build index 0720a7d684..bc2bea23b2 100644 --- a/meson.build +++ b/meson.build @@ -1217,6 +1217,31 @@ if build_docs endif endif =20 +if host_machine.system() =3D=3D 'windows' + nsis_cmd =3D [ + find_program('scripts/nsis.py'), + '@OUTPUT@', + get_option('prefix'), + meson.current_source_dir(), + host_machine.cpu_family(), + '--', + '-DDISPLAYVERSION=3D' + meson.project_version(), + ] + if build_docs + nsis_cmd +=3D '-DCONFIG_DOCUMENTATION=3Dy' + endif + if 'CONFIG_GTK' in config_host + nsis_cmd +=3D '-DCONFIG_GTK=3Dy' + endif + + nsis =3D custom_target('nsis', + output: 'qemu-setup-' + meson.project_version() + '= .exe', + input: files('qemu.nsi'), + build_always_stale: true, + command: nsis_cmd + ['@INPUT@']) + alias_target('installer', nsis) +endif + summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} summary_info +=3D {'BIOS directory': config_host['qemu_datadir']} diff --git a/scripts/nsis.py b/scripts/nsis.py new file mode 100644 index 0000000000..e1c409344e --- /dev/null +++ b/scripts/nsis.py @@ -0,0 +1,78 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2020 Red Hat, Inc. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import argparse +import glob +import os +import shutil +import subprocess +import tempfile + + +def signcode(path): + cmd =3D os.environ.get("SIGNCODE") + if not cmd: + return + subprocess.run([cmd, path]) + + +def main(): + parser =3D argparse.ArgumentParser(description=3D"QEMU NSIS build help= er.") + parser.add_argument("outfile") + parser.add_argument("prefix") + parser.add_argument("srcdir") + parser.add_argument("cpu") + parser.add_argument("nsisargs", nargs=3D"*") + args =3D parser.parse_args() + + destdir =3D tempfile.mkdtemp() + try: + subprocess.run(["make", "install", "DESTDIR=3D" + destdir + os.pat= h.sep]) + with open( + os.path.join(destdir + args.prefix, "system-emulations.nsh"), = "w" + ) as nsh: + for exe in glob.glob( + os.path.join(destdir + args.prefix, "qemu-system-*.exe") + ): + exe =3D os.path.basename(exe) + arch =3D exe[12:-4] + nsh.write( + """ + Section "{0}" Section_{0} + SetOutPath "$INSTDIR" + File "${{BINDIR}}\\{1}" + SectionEnd + """.format( + arch, exe + ) + ) + + for exe in glob.glob(os.path.join(destdir + args.prefix, "*.exe")): + signcode(exe) + + makensis =3D [ + "makensis", + "-V2", + "-NOCD", + "-DSRCDIR=3D" + args.srcdir, + "-DBINDIR=3D" + destdir + args.prefix, + ] + dlldir =3D "w32" + if args.cpu =3D=3D "x86_64": + dlldir =3D "w64" + makensis +=3D ["-DW64"] + if os.path.exists(os.path.join(args.srcdir, "dll")): + makensis +=3D "-DDLLDIR=3D{0}/dll/{1}".format(args.srcdir, dll= dir) + + makensis +=3D ["-DOUTFILE=3D" + args.outfile] + args.nsisargs + subprocess.run(makensis) + signcode(args.outfile) + finally: + shutil.rmtree(destdir) + + +if __name__ =3D=3D "__main__": + main() --=20 2.26.2