From patchwork Tue Jan 10 17:39:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 640871 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2855677pvb; Tue, 10 Jan 2023 10:29:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXukeAEbiS+uIpY00zha95xOFd6+nEvimGPbY/qWtG7Pcohgv3k+OL17Vp6vkD/FkUU/IuAb X-Received: by 2002:a1f:e685:0:b0:3da:dd8e:c11c with SMTP id d127-20020a1fe685000000b003dadd8ec11cmr2505453vkh.5.1673375399277; Tue, 10 Jan 2023 10:29:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673375399; cv=none; d=google.com; s=arc-20160816; b=OoTqnX9nn9xf0WxCwmn7dNPPU7HzmGijHxpqhvsY9f8F5BXuDP+A87xHykaez11bSO ZUgikqj2Srbokw6XCsDzobDqPg4vI9TPm4VXJkc3vnTLFuzc12anfa+5TyCPDieXZb/t 9v4l9ZXgMl31//BrwpP4KtwCPEmf7YK4pUup6D2TdQyVFd2fEN3cYnluuZCGIobs3br0 12ToC82s2AERe1YVgCq9sPNqo7wYWjFQC3qudMcfRGBOtrrRkv+J+cwjLlZe7RxL5bQ0 91aOUJPzaySlLrK2TMpnEieW/npaRCNxX3WKfPoTcHhQQPrBbMLzuuBXQtM8A0KnVpIL d8Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=EduU7oyQ6B1wSk7o4iq1oV+aNe30CeGVDzVVE6Byo1U=; b=aocdxW/ft9rLaQ3xhDPD03pXJ64PmnlxwpFC2Fms9KzQuyr+kJzDovFlz6k/fBN1Vh 93I7SUbuM352TK60aOwaZwAtyWMDi+e15IZ49+vEtIF7tbesxp7AZMmKsUuJN0tvvxZr QCXzWCGgiB9/y+U1t8s9nROb0uB91HACALOaJqL2lqTm6hOAaYm04hI/Xo4T1PHRngFm 3FcqH1KOe/XNuP6RlmA3ujRncR1St6WWKyc0kSaIfkTX+dD4SGQeiVJhvDKR8Nxs5VPH bgmBwSG9in8D5IVIkZpBSIwaf4/ztCNcM7SHz0wVhzzvW09sOxXm3I16MRIKANpYPhpK ZDRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="J/SLktG5"; 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 br37-20020a05620a462500b006fee881a686si7021584qkb.26.2023.01.10.10.29.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 10:29:59 -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="J/SLktG5"; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFIb4-0003TQ-Eo; Tue, 10 Jan 2023 12:39:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFIb0-0003Nw-HX for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:34 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIaw-0001EH-C0 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:34 -0500 Received: by mail-wr1-x429.google.com with SMTP id az7so12593383wrb.5 for ; Tue, 10 Jan 2023 09:39:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EduU7oyQ6B1wSk7o4iq1oV+aNe30CeGVDzVVE6Byo1U=; b=J/SLktG5dnNdWcoI2sj+EGyXN4ZGgy9GSddr311R/xXjH5nDjgxre/+0f4tnbM+w+9 r3VyliSrk4nOGVhwndXGfRTSLieV6jJKkl4nLMSUw4n4ZhkWCBS+5FakG5m8lWtLWxEy GHXHLgM137zDwG/RrDijc+lqsh+J2NrXia1sKLhG/+oWold6iVelIYc9kusEkvc8T1WG pOx2UGMNoRa3UL2+KqSDYWO2hNT1KJARmxd8p95r+2vauRHWorhMFDt91Tm8dcjDQ6Jl +ytViHwh9YojkD7jW7I6RnVuoRHL/OR8wcrzjdVjRRC/hO9zrTL2oTD2oTUWXercYVhf w3ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EduU7oyQ6B1wSk7o4iq1oV+aNe30CeGVDzVVE6Byo1U=; b=2QRuDogDTFH0BSZNYol4tUNbl5a7M5N+DLy5kx24JilSRXtme58nrgGd6A0nek+idD m1zJg+tLRy6iUKLQv9E/wLEzKMVr2mekJaDNmXxFLGvvvzmH+eacgpMFqgSjRrYRTcuu iHCo6NHS1jixCdy+0Oqm0iFPTLe29bdXnhS1PRAHrqB45hghM6M5vLOdCvkh6vQHasu0 Ke7zd8FnBlTT2seUCuLP9rPsbDBxPpTPtjRiB62tb3SG7H4ngr0qFTt8nS62pBRxuQlt CYJi5DYIuts7NBc0g/An9AisamV0KEicpDAQ1GsdKJBO07Hga/70J6GFz28UpI/qR5Dt ZW5g== X-Gm-Message-State: AFqh2komhChims+snmDjJRUiIRbiPHGdvnZl3Jc+VJ0sxJQn2/DVFcec bJzT5/UTKMIWJknfWq+yAL+saA== X-Received: by 2002:a5d:58e6:0:b0:26f:aaff:e98c with SMTP id f6-20020a5d58e6000000b0026faaffe98cmr38136006wrd.27.1673372368960; Tue, 10 Jan 2023 09:39:28 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f6-20020adffcc6000000b002bbdcd15e44sm8082510wrs.37.2023.01.10.09.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 98B631FFC0; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 08/26] meson: replace Perl usage with Python Date: Tue, 10 Jan 2023 17:39:04 +0000 Message-Id: <20230110173922.265055-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marc-André Lureau Let's try to remove Perl usage during build time. Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Message-Id: <20230110132700.833690-5-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée --- tests/qapi-schema/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 9dfe98bc9a..d85b14f28c 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -259,22 +259,23 @@ if build_docs # Fix possible inconsistency in line endings in generated output and # in the golden reference (which could otherwise cause test failures # on Windows hosts). Unfortunately diff --strip-trailing-cr - # is GNU-diff only. The odd-looking perl is because we must avoid + # is GNU-diff only. The odd-looking python is because we must avoid # using an explicit '\' character in the command arguments to # a custom_target(), as Meson will unhelpfully replace it with a '/' # (https://github.com/mesonbuild/meson/issues/1564) + remove_cr = [python, '-c', 'import sys;[sys.stdout.write(line.replace(chr(13), "")) for line in sys.stdin]'] qapi_doc_out_nocr = custom_target('QAPI rST doc newline-sanitized', output: ['doc-good.txt.nocr'], input: qapi_doc_out[0], build_by_default: true, - command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'], + command: [remove_cr, '@INPUT@'], capture: true) qapi_doc_ref_nocr = custom_target('QAPI rST doc reference newline-sanitized', output: ['doc-good.ref.nocr'], input: files('doc-good.txt'), build_by_default: true, - command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'], + command: [remove_cr, '@INPUT@'], capture: true) test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0], qapi_doc_out_nocr[0]],