From patchwork Sat Mar 5 10:57:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 548508 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp78753mag; Sat, 5 Mar 2022 02:58:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNjaRtdRG7lW8cx0Tfrm9ef6yz/+qcwnD4/a7g7FXGGwmdm5QC1gr06LlpNC/EB0m0rjxZ X-Received: by 2002:ac8:5bc2:0:b0:2de:adca:6624 with SMTP id b2-20020ac85bc2000000b002deadca6624mr2415047qtb.120.1646477912416; Sat, 05 Mar 2022 02:58:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646477912; cv=none; d=google.com; s=arc-20160816; b=dnqu0BPCxjXJAS3FwQ4I8JZt0j5JTklFOXcTyErbyO/uAsKWXrf+4EgTw+AHrwutyW LIH3N0zrnwWVboC6oF+Q0B39nMwJB+hHJghELXp+eRdpFerqdSjyxxPTn6I1ChE//y5D il0/KxdP/Djsxo4DfoOGnqINm7/kVe/CWmaVT1/yAz1yyrtpwc7MmacJjgaIKYQd0Ggk /c1qtNwkN8LNwpoYUtVrv+aOE9KFi38pXGdLvNJRpoOm4CM2n9U0JNI3HrOxW73Cre1r /SCg4/T9vSqYxGAIzPWlsBANjZi82+tfxGmlDKDONzv9WA2XZlsleD/mDilCSXOnamSJ YLrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=9wtRAo/PrrlV5Bn1mFToRucomuxQO+/fw/ePLHNPTDg=; b=FarXOj4wHzNr6amNlW+IuxmLCuX5TQZdCrKd29xFv6BW1BYkUyp/oHYPA7Vsu0ak/d 9nuMQryP/x4V39VMXhNucc8jBCTZf+pL2mNLfUAzdfxlxIf1yfwSSrtIA6y+LgXN2si1 kOAT1/W+fORpwUrRrYw3/p+jAnG9Zu3DknjHnqXlovsuD7mi7jVQfRf8sQRDoKFruCiW osuszmLCXgwctF1w1ycn3ipY6OkaWqiEtc6yisEfo4iGJs/QPYMLRjIXjZmrnZAVJ17S 9nw8ok+s5EpSTeXGrvDWZ2LUJDWTi4ZPpBd8yBMVZQmK/pMtovDv3quUq430aAEP0Nrb dfjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Vu9n0g1/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i13-20020a05620a404d00b0067af3ceaac4si488112qko.14.2022.03.05.02.58.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 05 Mar 2022 02:58:32 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Vu9n0g1/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQS7M-000452-1X for patch@linaro.org; Sat, 05 Mar 2022 05:58:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQS6e-00044P-Sn for qemu-devel@nongnu.org; Sat, 05 Mar 2022 05:57:48 -0500 Received: from [2a00:1450:4864:20::431] (port=41740 helo=mail-wr1-x431.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQS6d-0002Qf-HX for qemu-devel@nongnu.org; Sat, 05 Mar 2022 05:57:48 -0500 Received: by mail-wr1-x431.google.com with SMTP id i8so16143400wrr.8 for ; Sat, 05 Mar 2022 02:57:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9wtRAo/PrrlV5Bn1mFToRucomuxQO+/fw/ePLHNPTDg=; b=Vu9n0g1/QDVtu/lOsGTPfULn42L9DaUYBNVpK82c+A981JyRPa0dr+JxToslWsguoJ McdpFQ3Pdk5Xf0msM7EVv7+tNz0lu7MBo63k5P1Lz2EVh6HmYMXbrlA6yGiJe6JIKT7S 8nSaY50chBHrdI162YKbMCUeHOL7n0BxILOwoylQb8bqvvp5cKP4IoAWRhD5332MY2Kb q9o24lpUf2qaD5GmyJJJapb9TRDOFv7GFS8Z1RMqBwNA8PPjrBIy4VUbOZL0fEvhhsRB YnrkWXtu6pdIWStf7VCVuExSuK4uUlX3k5nG7dHDrdZgKDhOThwiMsqO0yFRFGCpbR14 rGmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9wtRAo/PrrlV5Bn1mFToRucomuxQO+/fw/ePLHNPTDg=; b=0b1GBzhuDSw29E5tI66W+tooNB1U7CZ3Kr0JRY/TyNw7UIaFKPElqsLjrKAfcfyFXh bW3w+zipofiDnQW0CEyQyTE2NhNkVapI4QUdjrKD7qh2x1sOliRmO3ymJASZhdsO9JHG AwROZ6HtJHVTyWzNhhzGO0MB1GwKdOw11hZdIu+iIglatfW/qN3Ci7r+FT5VqzB8AM5X BX8MSK2mlfwPoOcIyOTQfewQE3P58IznLdZd8wxvM2B34xdOfQxMBdQrI731ZJRsEqjx b/0yHmYfRFAbWorM1mpApkEJ9WMdEhhkbQ/pU1u+9ili57UjdYnSuTEky4ZJlBmY9ZEM 9aYw== X-Gm-Message-State: AOAM532MCvdAyV+oXFCl9jTFpf67PTTlYr6n0XWoaR+H+ve/cJxP+V1T m5t0nKo3pAdHVZcHxA+mSdNDglRub7Ux4A== X-Received: by 2002:a05:6000:1b8a:b0:1e4:b3a3:4c1f with SMTP id r10-20020a0560001b8a00b001e4b3a34c1fmr2143964wru.202.1646477866211; Sat, 05 Mar 2022 02:57:46 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id b13-20020a05600c4e0d00b003816cb4892csm24079324wmq.0.2022.03.05.02.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 02:57:45 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 1/3] nsis installer: List emulators in alphabetical order Date: Sat, 5 Mar 2022 10:57:41 +0000 Message-Id: <20220305105743.2384766-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220305105743.2384766-1-peter.maydell@linaro.org> References: <20220305105743.2384766-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::431 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Stefan Weil , John Snow , Cleber Rosa Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We currently list the emulators in the Windows installer's dialog in an essentially random order (it's whatever glob.glob() returns them to, which is filesystem-implementation-dependent). Add a call to sorted() so they appear in alphabetical order. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Weil Reviewed-by: John Snow --- scripts/nsis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nsis.py b/scripts/nsis.py index 5135a058316..383bef70332 100644 --- a/scripts/nsis.py +++ b/scripts/nsis.py @@ -34,9 +34,9 @@ def main(): with open( os.path.join(destdir + args.prefix, "system-emulations.nsh"), "w" ) as nsh: - for exe in glob.glob( + for exe in sorted(glob.glob( os.path.join(destdir + args.prefix, "qemu-system-*.exe") - ): + )): exe = os.path.basename(exe) arch = exe[12:-4] nsh.write( From patchwork Sat Mar 5 10:57:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 548510 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp78777mag; Sat, 5 Mar 2022 02:58:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJy86OGcqb8CDfdQmQ8ucNPEqsVX9oqci32eeP2wpwcMfJlWt8k+Bu2EHaSOlfJkiocJHJ2t X-Received: by 2002:ac8:5809:0:b0:2de:a097:98ca with SMTP id g9-20020ac85809000000b002dea09798camr2443063qtg.252.1646477915002; Sat, 05 Mar 2022 02:58:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646477914; cv=none; d=google.com; s=arc-20160816; b=tOmYj2DFJyNBfcxXaQk0CII2doZcaLNRZXzpGD1BxRZyFgXtK9NmhflAXHfzpRmevB UIFh7oezXcsEHQM1VySrgbUUwnTPbIbb+li2THos3RiiCYV1Eq8kyM+n3CQGbY6NgMtn lZf1ED4hfRH+qqDKjaZLNlgtFB8O9vxsb0iFMPgb++P5oWWL0YB5qMYgk2TlaHCW7sCg MxinKzJNFuWNC284ieFm6hCMlKjFIAWqNtMrcCId5xEqjNL6V6DNe2VivQgqbktRgQjy zZT/DSKA+UFPX14CLYke7shJCJSNiQCNCgQqebSOhZqutH8MI4QIq3zy1JXF71zz2V7G x/3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7zONuSKHAqhLjp/GIujk3Eq5yTF2yfO0KL8UNCqj52k=; b=WiwawG4PlAAUdV8snqb+jmdWMSNRMUH0IMQJqLmjlzjd04Vmqa2K0ecPITWHrOf3Yw bshTy6ItCU1zsqq+SoqCOAyhCM9iiP23osmSwksbIgUTYPup+iNzNOaaAR7sz4vBUW2a fHc1AxsTwPs2BKsFCWt96EmEbdNCMVa+6qEKL51JUT7ub7nEJJaRyBF2+TIyqml0qB0o QxSAy62WeO1rk92pTdTdTxH5cpR2WsNyEk5jEeOj2MeGAN3od1+YRARDS/leGVwAPMkj Tyv4nBb9nQlhE/IvQT9LCzlQbA6CBt6RGSkPEe9YLq2sTbJGXFgEiDaeX2gvq4WVk5lm e8Gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tzy9Nqwa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5-20020ac85945000000b002e012532e22si3375162qtz.605.2022.03.05.02.58.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 05 Mar 2022 02:58:34 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tzy9Nqwa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQS7O-00049T-KO for patch@linaro.org; Sat, 05 Mar 2022 05:58:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQS6f-00044c-T4 for qemu-devel@nongnu.org; Sat, 05 Mar 2022 05:57:49 -0500 Received: from [2a00:1450:4864:20::32d] (port=38746 helo=mail-wm1-x32d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQS6e-0002Qk-DA for qemu-devel@nongnu.org; Sat, 05 Mar 2022 05:57:49 -0500 Received: by mail-wm1-x32d.google.com with SMTP id m42-20020a05600c3b2a00b00382ab337e14so7362921wms.3 for ; Sat, 05 Mar 2022 02:57:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7zONuSKHAqhLjp/GIujk3Eq5yTF2yfO0KL8UNCqj52k=; b=Tzy9Nqwa89b3SM3iK5WHi6cu1QXOsLYr3/mikC9r8NsO2BwZr+/nurFoB++eHiIjHZ eKz0BprdmzLe6sZtGQRVNKr47a/BVXpG3cjKZ7yJgI8rasCLy6ae5FlZguSu+/af1+Ry NBPJBDlZgiOuM5a7x2mrjJXfyMWuy9xsX4s25sVf93v5jCTtnMyRdH22iSoK+MJdKjBl IpPIlnujKyUkfQQ3MH6CNWEGqvK72xhkt4kFZWXfm41NMoNvMnh2gz+Lh3I432GnAN5k W4gqHgN+O+PdyBOgcXjkjbUdQ+eVkWu6KFgglkTaqAEjiEuhXtWKMxElv9fQU7PoYbGp gtYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7zONuSKHAqhLjp/GIujk3Eq5yTF2yfO0KL8UNCqj52k=; b=bCbjLrwl/aKpeyl82v8CpMpGEpXqCe5z137/ps4cZwt6O55SI6I1bPuETEy3rnr3b2 wY6+fwNMg/qMGc5NT2QLN4rcpzPUfXgdRNCiwY0wusTx9CC6SFNZMYgmQNpK+6VTKhlU PSgvDAxj+poqdkKfj2YpLEMr37EZMHdG3r2fwB6geqk2CgE7Xov9EUrNSSknxGK55mfR H/ycMZ+w8lzQZojVfyBjWbOgIUJEEAoCr9+wlngc16+euwDttyhDA9DHbLLaP82ekNT5 nrYKHGJga02mP4EC32W7mrXblxFZ51I9VQXlgaXVoaEFKf240ldCUAPYOTjGfAvEtQYz 9eMA== X-Gm-Message-State: AOAM531I5j6DlAbdq033iJ6KCzSDe5uuJxUFwejZm1QETzgXubhXL8W4 +G4J5mthG5mfWCHpQEVi5B1GNGx8GgqrGQ== X-Received: by 2002:a05:600c:4e08:b0:381:9094:6b3c with SMTP id b8-20020a05600c4e0800b0038190946b3cmr11167256wmq.103.1646477867008; Sat, 05 Mar 2022 02:57:47 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id b13-20020a05600c4e0d00b003816cb4892csm24079324wmq.0.2022.03.05.02.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 02:57:46 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 2/3] nsis installer: Suppress "ANSI targets are deprecated" warning Date: Sat, 5 Mar 2022 10:57:42 +0000 Message-Id: <20220305105743.2384766-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220305105743.2384766-1-peter.maydell@linaro.org> References: <20220305105743.2384766-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Stefan Weil , John Snow , Cleber Rosa Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When we build our Windows installer, it emits the warning: warning 7998: ANSI targets are deprecated Fix this by making our installer a Unicode installer instead. These won't work on Win95/98/ME, but we already do not support those. See https://nsis.sourceforge.io/Docs/Chapter4.html#aunicodetarget for the documentation of the Unicode directive. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Weil --- qemu.nsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qemu.nsi b/qemu.nsi index c3df8c9d3b0..a44d2be32a2 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -35,6 +35,9 @@ !define OUTFILE "qemu-setup.exe" !endif +; Build a unicode installer +Unicode True + ; Use maximum compression. SetCompressor /SOLID lzma From patchwork Sat Mar 5 10:57:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 548511 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp79862mag; Sat, 5 Mar 2022 03:00:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwlL7bReo39XtHHU38hz5IIhSKvRuzowDgUGlkV024VPZ96lkR/wiQg56RkYD32TZXfrasV X-Received: by 2002:ac8:5e4b:0:b0:2dd:dc99:d22b with SMTP id i11-20020ac85e4b000000b002dddc99d22bmr2371202qtx.165.1646478020990; Sat, 05 Mar 2022 03:00:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646478020; cv=none; d=google.com; s=arc-20160816; b=EnNMz7/pYHTA5uOJUxZcZPuaGL8TrFwflcUF1dCurHjiLaNqos2ROWlWC5Ly2uV6HV VLX6DNh2gPyOjCjcVQHCZHQdp+tzTew5kZppyyFw9ny4326AJfCGOkD2QXGhUTb6wz7G C8YPI0H7A69kwU9NK8J+NDxxxa347L2TbXADd4oZc8H7de26godLZsb3HynxuDw44O2j abaM4Clv5dnQAuXfjCkyjHPaNyvb99RD/U8b8nJ9adx92rdDVv4qNKVivkMoFNp+u/ha /fQIF+JwNfVj163AVBQ9e8f0L4GJQ0W7OB/nopdkYdEAtbr4jLVxfkKIt18pHhaqiShs 0kHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=bUX9V0ZBEbQk4Ir+TZBJ/F4T0+S7tCpReG3Qi8NpDVg=; b=le77mWqGQRUpSCupXa+ZnC4uh7ZlDQUmV63oJUvO22wD4B3XaTciYqG3CML0RY+//h 31bXwreKo0JjdgfELDa0lPcmwCbeKzvGltdhG3QgDPwK1rTxZ6Pr1nfQ5TfSlwOBWQed CchfZiQLJQVDvhw8/BDTF5rwC8dDmlN3TVtpWRZb+BwEX3ncnhvt4aak4tqox0YGgJcB RSLzFZ6dNIExhf3TNVEFnKbcI0n1fyn8TDzw4vgEeBmEO0foPpy5Drq2kGIp2N5ugyeQ mdVy8WOAS6omAlY8B7id3Uvbb/2Cj18badR4AjvmzDD5co/J5o6h5eNsuamfpTHX+PG6 WnSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Pn8ePUqV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k10-20020a37a10a000000b00648ccafd608si1936549qke.40.2022.03.05.03.00.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 05 Mar 2022 03:00:20 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Pn8ePUqV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQS96-0008Lw-Jh for patch@linaro.org; Sat, 05 Mar 2022 06:00:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQS6g-00045s-Sg for qemu-devel@nongnu.org; Sat, 05 Mar 2022 05:57:50 -0500 Received: from [2a00:1450:4864:20::333] (port=36749 helo=mail-wm1-x333.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQS6f-0002Qp-6c for qemu-devel@nongnu.org; Sat, 05 Mar 2022 05:57:50 -0500 Received: by mail-wm1-x333.google.com with SMTP id r64-20020a1c4443000000b003898fc06f1eso28893wma.1 for ; Sat, 05 Mar 2022 02:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bUX9V0ZBEbQk4Ir+TZBJ/F4T0+S7tCpReG3Qi8NpDVg=; b=Pn8ePUqV0cbmn1wpDyBxyC4C4xwuXTsjs3WnQMKknRNiUtHLxOgAxtWEEqtc8mhImE E0b3QhPJU/XHlfIXDHHwwWyRPzw6bD750VVHBKNmsiAJiq/2jfrVUf9Yu32gv2b39y75 /fT0caxTsXq7x3Yi1mK/fzJVkm9wiLo9sxXUwuxfzacLYDt8M21VehC2qg4edehcM8OO zxAHc93H8B/YfOLpd0aKsKhHBRmIHp0UzNZRjGFssDxgaAuPPX6O3hD22emPZSqr+NN/ C3BwTiwHBMp3p155FTx6JGQjrYZQ/dOdnRHkuH7u0tEOOXtIKmfL1cWJNriSBGF8Jy4i Z73Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bUX9V0ZBEbQk4Ir+TZBJ/F4T0+S7tCpReG3Qi8NpDVg=; b=GUkL49DzxoUPhh7D4Sghvyd8r/OX7r3qqMYRhP11V4GvyBy8rdZi0qhS4DYAkMwPzc w7F8TOnaWVCckSP2TEIPggGGqV5fpq0F0ukXshvjOD7+eehM33Vrvw70HVPhyAB9l2/W cxpz4SDG9zTKglE5dxMM6LKzMDdIj56alVVAu6CTQQ+4slME9Av6Xfnw1bU42g3ARvSP jQkdKfD9m5+WHxlsOwAf5GMbcoUTaM2E9lUm6gTDSSt2mD7dkhXvMTqsutVzvmRQddWV 2C7NzH8smzQAcnmicWLtyBJqTex6bfDfbFeoVvCn05oJMA7TsW9f7ZV3CqPz0mY0acI9 tD9g== X-Gm-Message-State: AOAM5307511YYKG5bGmJrRQYpIwyr1bxTyLnhsTdDOUCb2UUZWzTV2g1 3/hep45E4jpQ7yGKDojGD+8tMtwAD+2jZQ== X-Received: by 2002:a05:600c:190c:b0:389:8f94:fcac with SMTP id j12-20020a05600c190c00b003898f94fcacmr2023482wmq.27.1646477867859; Sat, 05 Mar 2022 02:57:47 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id b13-20020a05600c4e0d00b003816cb4892csm24079324wmq.0.2022.03.05.02.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 02:57:47 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 3/3] nsis installer: Fix mouse-over descriptions for emulators Date: Sat, 5 Mar 2022 10:57:43 +0000 Message-Id: <20220305105743.2384766-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220305105743.2384766-1-peter.maydell@linaro.org> References: <20220305105743.2384766-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::333 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Stefan Weil , John Snow , Cleber Rosa Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We use the nsis.py script to write out an installer script Section for each emulator executable, so the exact set of Sections depends on which executables were built. However the part of qemu.nsi which specifies mouse-over descriptions for each Section still has a hard-coded and very outdated list (with just i386 and alpha). This causes two problems. Firstly, if you build the installer for a configuration where you didn't build the i386 binaries you get warnings like this: warning 6000: unknown variable/constant "{Section_i386}" detected, ignoring (macro:_==:1) warning 6000: unknown variable/constant "{Section_i386w}" detected, ignoring (macro:_==:1) (this happens in our gitlab CI jobs, for instance). Secondly, most of the emulators in the generated installer don't have any mouseover text. Make nsis.py generate a second output file which has the necessary MUI_DESCRIPTION_TEXT lines for each Section it creates, so we can include that at the right point in qemu.nsi to set the mouse-over text. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: John Snow --- I opted to put the logic into the Python script, which I think many QEMU contributors understand, rather than investigating whether NSIS installer script magic might for instance allow us to write out only one file rather than two, since I think very few of us understand the NSIS installer... --- qemu.nsi | 5 +---- scripts/nsis.py | 13 ++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/qemu.nsi b/qemu.nsi index a44d2be32a2..aa93adee396 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -228,10 +228,7 @@ SectionEnd ; Descriptions (mouse-over). !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SectionSystem} "System emulation." - !insertmacro MUI_DESCRIPTION_TEXT ${Section_alpha} "Alpha system emulation." - !insertmacro MUI_DESCRIPTION_TEXT ${Section_alphaw} "Alpha system emulation (GUI)." - !insertmacro MUI_DESCRIPTION_TEXT ${Section_i386} "PC i386 system emulation." - !insertmacro MUI_DESCRIPTION_TEXT ${Section_i386w} "PC i386 system emulation (GUI)." +!include "${BINDIR}\system-mui-text.nsh" !insertmacro MUI_DESCRIPTION_TEXT ${SectionTools} "Tools." !ifdef DLLDIR !insertmacro MUI_DESCRIPTION_TEXT ${SectionDll} "Runtime Libraries (DLL)." diff --git a/scripts/nsis.py b/scripts/nsis.py index 383bef70332..462d6cac3b6 100644 --- a/scripts/nsis.py +++ b/scripts/nsis.py @@ -33,7 +33,9 @@ def main(): subprocess.run(["make", "install", "DESTDIR=" + destdir + os.path.sep]) with open( os.path.join(destdir + args.prefix, "system-emulations.nsh"), "w" - ) as nsh: + ) as nsh, open( + os.path.join(destdir + args.prefix, "system-mui-text.nsh"), "w" + ) as muinsh: for exe in sorted(glob.glob( os.path.join(destdir + args.prefix, "qemu-system-*.exe") )): @@ -49,6 +51,15 @@ def main(): arch, exe ) ) + if arch.endswith('w'): + desc = arch[:-1] + " emulation (GUI)." + else: + desc = arch + " emulation." + + muinsh.write( + """ + !insertmacro MUI_DESCRIPTION_TEXT ${{Section_{0}}} "{1}" + """.format(arch, desc)) for exe in glob.glob(os.path.join(destdir + args.prefix, "*.exe")): signcode(exe)