From nobody Sat May 18 19:47:59 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=1598367988; cv=none; d=zohomail.com; s=zohoarc; b=nAWA6DhbusFlBKdD2i8UMG5swN3MHcr6h180Hr5c217qzCsK3+XmFvT2GavkFJSlDM8H+I1OuqIrP8YfS38+xXbhF8kRvJTEyS4BT3QQY9WUmd09DpuO2wF+PIrCbHqgp+cLFz43YNYzt7zayPe7RJTmWod9bk8B+mmiOH1H0Qg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598367988; 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=EosHnTJx8cQ4ugff1Jpe7y3Lp8LjQYuTM8yCF9O+EO3qEcqqEODLA9RZvBrylf+PoA8Ppu5uLzwam4ejFcV5o2AuugGs0yLvoNY6VZhFaFZ+bb1zg50oTZx5o/G48iuic+r7mnSuFBJ2ECiNiOxdlWAeD05rVG47Fqwu4JPc1M0= 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 1598367988871184.1976150315512; Tue, 25 Aug 2020 08:06:28 -0700 (PDT) Received: from localhost ([::1]:54256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaWn-00030U-HO for importer@patchew.org; Tue, 25 Aug 2020 11:06:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaUx-0007vL-CI for qemu-devel@nongnu.org; Tue, 25 Aug 2020 11:04:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39070) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAaUv-0003D4-LZ for qemu-devel@nongnu.org; Tue, 25 Aug 2020 11:04:31 -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-82-aznAmlq2OCGwdcIMn0RVZA-1; Tue, 25 Aug 2020 11:04:24 -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 95F5F18B9F87; Tue, 25 Aug 2020 15:04:23 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0728F5D9CA; Tue, 25 Aug 2020 15:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598367868; 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=EyehmxSYG6CBc05R2DeWySJm2WaZy4BAuIYFf5BAdgZiFDsfh04udWtJGCAVYhpv21WjTO OGcoPMyyE3Odx6faXA4b2fdU2ZqN5x6LQQnTRmZn0/co9Rs8rPsRY8EBvSyV04sRnSvcRI 3Zd5q7VfB+UNapVa4TcrN9ayTvQEduY= X-MC-Unique: aznAmlq2OCGwdcIMn0RVZA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 1/5] meson: pass confsuffix option Date: Tue, 25 Aug 2020 19:04:05 +0400 Message-Id: <20200825150409.346957-2-marcandre.lureau@redhat.com> In-Reply-To: <20200825150409.346957-1-marcandre.lureau@redhat.com> References: <20200825150409.346957-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=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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , sw@weilnetz.de 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 Sat May 18 19:47:59 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=1598367937; cv=none; d=zohomail.com; s=zohoarc; b=hs6r2bQ51fYLLkGwkTM+nEvfZgFo8KHehkbci8YHRNVUX6C+RkH7LMWBlB5zGfrZtF5q7nZ5dVi3vX1xhvEv85iommoj3zjgGBvyh4BNBhwqiUcdkuUvWCYNqwBmj8qgLJmGozqSHW+7Ob9f5Mcu8a1ABt7ctpEL969xKQevkX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598367937; 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=csDdvqK0lel6O+L/7YosmjLZv3zq+wsNe6Ix1aCY5gNjhJnFe7OQkeRf6u8Rgx9QtgJRtM2xMl6lZekofRRpvTZBMtsLtDJYn4NEkyVwuvZTJp5QDcTQviBff43Dth1bPH4ajnntarJQtnkZCBrb4hKpc21kOQtb2xTsSzyI5vk= 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 1598367937289164.38838289526961; Tue, 25 Aug 2020 08:05:37 -0700 (PDT) Received: from localhost ([::1]:50202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaVz-0001JB-VK for importer@patchew.org; Tue, 25 Aug 2020 11:05:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaV8-0008Ea-HF for qemu-devel@nongnu.org; Tue, 25 Aug 2020 11:04:42 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:38427 helo=us-smtp-delivery-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 1kAaV5-0003Dy-SS for qemu-devel@nongnu.org; Tue, 25 Aug 2020 11:04:42 -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-538-m0_tTZxOOYuyRiw8V58Sqg-1; Tue, 25 Aug 2020 11:04:33 -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 88C42800D53; Tue, 25 Aug 2020 15:04:32 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40D3A1014161; Tue, 25 Aug 2020 15:04:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598367879; 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=DQFJ8OOYxPtBlrwzg5WmO6f9tIL68qNRlnyPMI2j8SoFTQC7/i2h5pFQddsDdX7kH/8OzS mvW/JwgxIw3jE/vRJJOYmKWozleN+ByD2SdNV4Cd40TGuLUgg+PLpqegSreUM6bmpgWhFs 177fazbdTqi/vs5eMj70QbnpW87PXMI= X-MC-Unique: m0_tTZxOOYuyRiw8V58Sqg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 2/5] meson: use meson datadir instead of qemu_datadir Date: Tue, 25 Aug 2020 19:04:06 +0400 Message-Id: <20200825150409.346957-3-marcandre.lureau@redhat.com> In-Reply-To: <20200825150409.346957-1-marcandre.lureau@redhat.com> References: <20200825150409.346957-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=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:35:36 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_H4=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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , sw@weilnetz.de 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 Sat May 18 19:47:59 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=1598368005; cv=none; d=zohomail.com; s=zohoarc; b=i2bO5YKcdtVJWDfVDXbdp34VVkrU5BIHz9zr0OuF9LkPBRKaq9ZETVWMXQXbJ2vyG244vnkClkSuUW8JmoKfj891wZQGe8lCzSdKCkwg6TO4ZvI7VcZqpug1hlAwr5QrYWCCCGu5fKBz5/YnY9DyTFg/XCYI4n888QB35hc5mZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598368005; 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=T06CM7qliGSKWCCDhkc4SwP0rJVNKbQ7834fTMQ8s8ph52jZFe5m0mtpejqPKQV/WqnAkuaKp75vbSXODUUnVn7YsgaYBOyne1UEKFXvXCvKGQsJLTXAqN9+r9qFMYfsZAzDru5J0BwjYnVo4YwQ0ocNc8Vi2sBFWyRfsIwWJc0= 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 1598368005811154.82755506900537; Tue, 25 Aug 2020 08:06:45 -0700 (PDT) Received: from localhost ([::1]:56030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaX6-0003ic-J4 for importer@patchew.org; Tue, 25 Aug 2020 11:06:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaVC-0008LZ-20 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 11:04:46 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47469 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 1kAaVA-0003EY-AP for qemu-devel@nongnu.org; Tue, 25 Aug 2020 11:04:45 -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-4-I36FZexcOli2_TQq-VT93w-1; Tue, 25 Aug 2020 11:04:38 -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 E1D1218B9F84; Tue, 25 Aug 2020 15:04:37 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE0C41002382; Tue, 25 Aug 2020 15:04:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598367883; 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=Sc/A1iCmwxL2oCeQhgJhecmOtVtKr7DRpF/oxZwa4EOSuCw98MCoQoFPX6FSlVhLnNbu+4 fT0bl09KS64TSNkwvW2U/zgBhUvj1NGE6LBFG6SImrqP3zb4IzbwJy1wZI1jF6cetnUp0L 1aG8HFeeWb9A4dMN6c7iHKDbJ8SjqIY= X-MC-Unique: I36FZexcOli2_TQq-VT93w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 3/5] meson: add docdir option and pass pre-prefix qemu_docdir Date: Tue, 25 Aug 2020 19:04:07 +0400 Message-Id: <20200825150409.346957-4-marcandre.lureau@redhat.com> In-Reply-To: <20200825150409.346957-1-marcandre.lureau@redhat.com> References: <20200825150409.346957-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=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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , sw@weilnetz.de 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 Sat May 18 19:47:59 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=1598368110; cv=none; d=zohomail.com; s=zohoarc; b=DgCWYoKBKBHkBZpWVV8hJB0tyI1BOEDlKaOJW6FrAOz3RTKeNm8zTO4V488pYtI40XTtyHJu8XmjRlE2j252YlxNofvie4l+egQcZfKXp3ME0lJrFd25WDjHuI6vtUYWPnoSqbCkNopq3dQoM+OUOGCx36rTMcHq6gILz3CFe2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598368110; 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=HnPOnTTEKrlKIwPOlq6BlqVd3/Fra1/YN1Vcme7tbvAJUzQiMnvoP+C7pxAW3i/rRXdHSNdX0FJ5DUJNwsxSbUilwET0kWQY/MLM/moKMdMQE3IKa55WTmyATe3AiKYJfKGLpkcpJsC1ERRPs8TWgs6D5GOB1LfkM0t5vHD1ixc= 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 1598368110098872.1807110453634; Tue, 25 Aug 2020 08:08:30 -0700 (PDT) Received: from localhost ([::1]:33416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaYm-00067g-QG for importer@patchew.org; Tue, 25 Aug 2020 11:08:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaVO-0000O6-5r for qemu-devel@nongnu.org; Tue, 25 Aug 2020 11:04:58 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:45139 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 1kAaVM-0003GT-Cs for qemu-devel@nongnu.org; Tue, 25 Aug 2020 11:04:57 -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-385-pvrDoAtgN3uZuXkZD9kpmQ-1; Tue, 25 Aug 2020 11:04:53 -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 0DCA11902EC0; Tue, 25 Aug 2020 15:04:47 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06959702E7; Tue, 25 Aug 2020 15:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598367895; 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=Jwv8fo777HZPIWxc2GNJXfJqkUV5giEfuwgUZd6DWCMbGe+MSLWr29JXdJayv4HS3wxE0f 52m8VAz6ZhUVtC0s7/Wr7J4j8qL/hBbrslx/bF8HpsOVYVOOoDvCX7ShTyRjd451cwl+du 7oChFu3SmYErPhVxb+9y/v+WM7UfZq4= X-MC-Unique: pvrDoAtgN3uZuXkZD9kpmQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 4/5] meson: use meson mandir instead of qemu_mandir Date: Tue, 25 Aug 2020 19:04:08 +0400 Message-Id: <20200825150409.346957-5-marcandre.lureau@redhat.com> In-Reply-To: <20200825150409.346957-1-marcandre.lureau@redhat.com> References: <20200825150409.346957-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.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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , sw@weilnetz.de 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 --- 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 Sat May 18 19:47:59 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=1598368161; cv=none; d=zohomail.com; s=zohoarc; b=mU4dEh+aSGjcba0EbZk48bh2LhzTxe3QBRL7kjgTIyrLE+XnJXDElSBrL8vwrXeQVL10uGZrQ3aqwIpG/lM2IzAihu/44hETr3UW6nvB/FYwic6CAY+X5AdOFJsS42tUp+Wa6vG0Z70e0sxA8Tvc261LgeltoUCWLL4CqEeY8kc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598368161; 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=SpOKpmoPR63A2ouAeyyv2SRBoxnyNRTpMnWZ/m2cKpw=; b=OZ5gSo57uVctjvQS35uHa2YfpbGkHWd01oDBkXDF7vpTSJ3S0ibtlPGG+jyQrOUIJcrrC4rYMgQ2tByrmxgOLPptSBUTtiWrdwOorogX3j5ZO2Fjxk1eIn9hKq93EWP9KntGX6iYVIEo2vt2GWRb+0zKNt423zFu3q9ABwOo76g= 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 1598368161346485.71691285193947; Tue, 25 Aug 2020 08:09:21 -0700 (PDT) Received: from localhost ([::1]:36788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaZc-0007XX-4G for importer@patchew.org; Tue, 25 Aug 2020 11:09:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaVV-0000if-P7 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 11:05:05 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:36880 helo=us-smtp-delivery-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 1kAaVT-0003K3-BQ for qemu-devel@nongnu.org; Tue, 25 Aug 2020 11:05:05 -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-437-Wet2VMz6Pd2bg544PjyOcg-1; Tue, 25 Aug 2020 11:04:56 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 20E57106C109; Tue, 25 Aug 2020 15:04:55 +0000 (UTC) Received: from localhost (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BE9C19C4F; Tue, 25 Aug 2020 15:04:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598367902; 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=SpOKpmoPR63A2ouAeyyv2SRBoxnyNRTpMnWZ/m2cKpw=; b=Iosxe3sAggLLwYfr9BslZ23JwPFFIYUddATLk+9Nw80rZvr7wpwwu9upQCyTeqL5WZHO/u PK2MfuoR2sdB/2deUW0zB27L15SER72a9wqdfi8K62fm2hIaSh51zQZzU0B7XRCswowb1/ 6esP/SlyAt2XX5GEL/fvslEE0eX7VCM= X-MC-Unique: Wet2VMz6Pd2bg544PjyOcg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 5/5] meson: add NSIS building Date: Tue, 25 Aug 2020 19:04:09 +0400 Message-Id: <20200825150409.346957-6-marcandre.lureau@redhat.com> In-Reply-To: <20200825150409.346957-1-marcandre.lureau@redhat.com> References: <20200825150409.346957-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:36:47 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_H4=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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , sw@weilnetz.de 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 --- Makefile | 56 ----------------------------------------------- meson.build | 24 ++++++++++++++++++++ scripts/nsis.sh | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 56 deletions(-) create mode 100755 scripts/nsis.sh 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..4ee8ef1e9d 100644 --- a/meson.build +++ b/meson.build @@ -1217,6 +1217,30 @@ if build_docs endif endif =20 +if host_machine.system() =3D=3D 'windows' + nsis_cmd =3D [ + find_program('scripts/nsis.sh'), + '@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.sh b/scripts/nsis.sh new file mode 100755 index 0000000000..d7d8b39b04 --- /dev/null +++ b/scripts/nsis.sh @@ -0,0 +1,58 @@ +#!/bin/bash -e + +OUTFILE=3D"$1" +shift +PREFIX=3D"$1" +shift +SRCDIR=3D"$1" +shift +CPU=3D"$1" +shift + +DESTDIR=3D$(mktemp -d) +trap 'rm -rf $DESTDIR' EXIT +make DESTDIR=3D"$DESTDIR/" install + +do_signcode() { + if [ -z "$SIGNCODE" ]; then + return + fi + "$SIGNCODE" "$@" +} + +shopt -s nullglob + +( + cd "$DESTDIR$PREFIX" + 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 +) > "$DESTDIR$PREFIX/system-emulations.nsh" + +( + cd "$DESTDIR$PREFIX" + for i in *.exe; do + do_signcode "$i" + done +) + +if [ "$CPU" =3D "x86_64" ]; then + CPUARG=3D"-DW64" + DLLDIR=3D"w64" +else + DLLDIR=3D"w32" +fi + +if [ -d "$SRCDIR/dll" ]; then + DLLARG=3D"-DDLLDIR=3D$SRCDIR/dll/$DLLDIR" +fi + +makensis -V2 -NOCD -DSRCDIR=3D"$SRCDIR" -DBINDIR=3D"$DESTDIR$PREFIX" \ + $CPUARG $DLLARG -DOUTFILE=3D"$OUTFILE" "$@" + +do_signcode "$OUTFILE" --=20 2.26.2