From nobody Wed Feb 5 08:40:02 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652465666; cv=none; d=zohomail.com; s=zohoarc; b=oF/entlSgBXixj53djmShvPSNnmhFteeXc5dCUpl2yOETDqkObj6LEFyD6V0o33kQMe8wL4u1zT0oZY8HrpMfhWn5byBPU+ZHLgx4DDAiCxiXtFBFYSOaBJXKbVFkipkkAx2a4CEDPzd90835h6/JyI7GQln80Njh+ayZ0gY+VU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652465666; 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=Olum9Pty0O24L9mPdjGTqHP2sNTsbWFCGNZznGFul1I=; b=f/vhb/nWEroI/iSaACJg9BIP9zBU7ZzcPyOoWvYLjafiq6FAfZqEx7bX4A1qeyiDz+2kK7iZl7j4pj6cdS82sOQ9DOQYMExr9iVth1SZn30g67Zl2H6GZGuKSaJC8S+1/mJTI4ugwsF8P1FWXxR/LshvUB0F/JX7b2pv6JLHXEI= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652465666917592.9270055072483; Fri, 13 May 2022 11:14:26 -0700 (PDT) Received: from localhost ([::1]:44912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1npZo1-0001mJ-SZ for importer2@patchew.org; Fri, 13 May 2022 14:14:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npZij-0001aT-PV for qemu-devel@nongnu.org; Fri, 13 May 2022 14:08:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npZih-00072B-Sk for qemu-devel@nongnu.org; Fri, 13 May 2022 14:08:57 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-144-t3KHer6HOUyJ8XbbR-2emw-1; Fri, 13 May 2022 14:08:53 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32A8880CDA7; Fri, 13 May 2022 18:08:51 +0000 (UTC) Received: from localhost (unknown [10.39.192.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id B12ED43EA06; Fri, 13 May 2022 18:08:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652465335; 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=Olum9Pty0O24L9mPdjGTqHP2sNTsbWFCGNZznGFul1I=; b=bHitKL4wpZAhfzq727ke83lLt6txa4sxaw2xKw9tDnBj0fGx6aRmibBasQ/rP925IB0A+x YkFsKIgyKprTGNRGCZJCKPontEo6wMxoDdDKXE6S939m6g6BuWtnrEUOilxGdKJjlpBUtv c340D1LMxkHVzsCPQizU/Slh7K9L6GU= X-MC-Unique: t3KHer6HOUyJ8XbbR-2emw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Konstantin Kostiuk , Michael Roth , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v3 11/15] qga/wixl: prefer variables over environment Date: Fri, 13 May 2022 20:08:17 +0200 Message-Id: <20220513180821.905149-12-marcandre.lureau@redhat.com> In-Reply-To: <20220513180821.905149-1-marcandre.lureau@redhat.com> References: <20220513180821.905149-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652465668307100001 From: Marc-Andr=C3=A9 Lureau No need to setup an environment or to check if the variable is undefined manually. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Konstantin Kostiuk --- qga/installer/qemu-ga.wxs | 30 +++++++++--------------------- qga/meson.build | 9 ++++----- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index 0950e8c6be..8a19aa1656 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -1,17 +1,5 @@ - - - - - - - - - - - - @@ -43,20 +31,20 @@ Name=3D"QEMU guest agent" Id=3D"*" UpgradeCode=3D"{EB6B8302-C06E-4BEC-ADAC-932C68A3A98D}" - Manufacturer=3D"$(env.QEMU_GA_MANUFACTURER)" - Version=3D"$(env.QEMU_GA_VERSION)" + Manufacturer=3D"$(var.QEMU_GA_MANUFACTURER)" + Version=3D"$(var.QEMU_GA_VERSION)" Language=3D"1033"> NOT VersionNT64 - + 1 - + - + - + @@ -133,9 +121,9 @@ + Key=3D"Software\$(var.QEMU_GA_MANUFACTURER)\$(var= .QEMU_GA_DISTRO)\Tools\QemuGA"> - + diff --git a/qga/meson.build b/qga/meson.build index 6d9f39bb32..3ad3bc0260 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -121,15 +121,14 @@ if targetos =3D=3D 'windows' output: 'qemu-ga-@0@.msi'.format(host_arch), depends: deps, command: [ - find_program('env'), - 'QEMU_GA_VERSION=3D' + config_host['QEMU_GA_= VERSION'], - 'QEMU_GA_MANUFACTURER=3D' + config_host['QEM= U_GA_MANUFACTURER'], - 'QEMU_GA_DISTRO=3D' + config_host['QEMU_GA_D= ISTRO'], - 'BUILD_DIR=3D' + meson.build_root(), wixl, '-o', '@OUTPUT0@', '@INPUT0@', qemu_ga_msi_arch[cpu], qemu_ga_msi_vss, + '-D', 'BUILD_DIR=3D' + meson.build_root(), '-D', 'Mingw_bin=3D' + config_host['QEMU_GA_= MSI_MINGW_BIN_PATH'], + '-D', 'QEMU_GA_VERSION=3D' + config_host['QE= MU_GA_VERSION'], + '-D', 'QEMU_GA_MANUFACTURER=3D' + config_hos= t['QEMU_GA_MANUFACTURER'], + '-D', 'QEMU_GA_DISTRO=3D' + config_host['QEM= U_GA_DISTRO'], ]) all_qga +=3D [qga_msi] alias_target('msi', qga_msi) --=20 2.36.1