From patchwork Tue Jan 24 18:00:59 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: 646028 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp338714pvb; Tue, 24 Jan 2023 10:03:38 -0800 (PST) X-Google-Smtp-Source: AK7set/SSeW+mYqk6HV22c1QqT3o/kG6JUreM/smbck/yXPcPvZJc4E4We/FO7W0zeOlIxL4+uwO X-Received: by 2002:a05:7500:6616:b0:f2:9d23:78e3 with SMTP id ix22-20020a057500661600b000f29d2378e3mr490491gab.52.1674583418223; Tue, 24 Jan 2023 10:03:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674583418; cv=none; d=google.com; s=arc-20160816; b=y641N4uuAJ/cqTNulVpqkpERj/Sw3ViAFyCvbjANICJqqzw7NhmehoiZc0yil96PoT 7/eEIQO/BYJiAcpL7LHT91pIRkeR68xM5OEWN25P+026PNw+iMn57csq8qXV9ugqFd1c PSJEL0kVHy14jIpaR5rUqi0AUWTf2D1Pt4gsJtju2IfkGKOvEckf/UaVgAa1nHbG+Nnj fIPy2kqBBVwupQLpAw+ptKPNF438PKz7b1fAJ9XDFtkdcn0HCJypEe22RIGpaqggZYGW LznCak2RIcx90VqPWkOkBp8B6/d2HcrxpcApaws7UTtzhs06lOrY3b2xTy5JVxQJ2PTx q8WQ== 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=wgPMIvmNkHwNoz+7yHEF/4zaUvE5dBGgj7qoIrvwjdnGSOj4h6BSTnjm2+MIbOc1sl EJgL9CAA86ZTA20ECBSiRFzdzajtG+tvQgmSoXL6pDxYnS47G0wiFcHa8fCrDPBf0XAJ 0R5BRj2iIL66+V0lCDRkrjFrgRM607YtWcYz5PtzRD3NIT2DgeLzKHPO+1M6UZoEvO6V CBHCcafSMy0D9/0DcpTSswD+q3hUMjct4wAMPNO3K7Oxe7vVq/xWnqifIeg57/NCD8mQ iMmNUmZA6u0A5ID3hKxSnT9Bygjrhaca79jZbGWvyOJdylt6YSYtwkpo3AyQ180T9jf0 DBEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=th3BYAJb; 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 oq48-20020a05620a613000b00706736870acsi2178651qkn.704.2023.01.24.10.03.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jan 2023 10:03:38 -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=th3BYAJb; 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 1pKNcU-0001fd-Ke; Tue, 24 Jan 2023 13:02:06 -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 1pKNc8-0001Vd-RD for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:01:45 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKNbz-000658-Pj for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:01:44 -0500 Received: by mail-wm1-x32d.google.com with SMTP id c10-20020a05600c0a4a00b003db0636ff84so11597601wmq.0 for ; Tue, 24 Jan 2023 10:01:34 -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=th3BYAJbe6fYKeL2p55WJDd6CRlD3ezY4JD7qmfPdLUGUvecTJVHWNOcH3gTdg58Gx Xv6QW95d9MgQegAk2d+Zj5WB6cum2FI/rGyGVXgm2q/WXQ5yQYQRSqLTkxpajRDJnxPo AiB3RYI92+lLbPB5LOdSs9xRvq9i3acVVst2J4xTcAmBmNLThJOH6HLlWhkDqnzjfJjG Nfjl98PV34LPKyLpdRqq5+jOJbJK3PLgXywRIG+q+qASvZGg/NuiYRoULRsUP+bn3sXk 37nQ5ypyVg9+KRbyB+NZX3m4V1Jk202ZXYG1CsfCFmQO6se8yk4qayBUpaMafvTQs53a 70Bg== 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=VxxQ8wOxeD2/vgLDTyx0e4x5SYGl54fZjhUMlqlpKpDQjVL24dp2oVWfKKYLEzvYAp ynnBoLw3hxKKQT9bs8d8d0fjHMUYU4/qqilPyMxjujfkIc3VyEDlu2sLAYBmNos7gsvs skKkhxTSiHRl1VuhM+oqtq1ux5R3froo7S9ki9dqo8+LSLlr9Kw7cCqgirA+IzdarCU5 VjRGrqbDd7mCJm30uuZf5zEdrFDL7qoZK3qj72p+O6JWyzzkCgwh24ASQm5TtRzwZ9Sb kq98KkWO4hthbctVnC8hS+4u2tAIs7BjO+benh2aHMwDuIbB4Pme4Vn84YWiJ8XF+pKk JPBw== X-Gm-Message-State: AFqh2kqDp3go4UCqcSXRga/EjNkHocSMVAZbPL8ISg3n65vYS0Lav8cB quIgNvb6NMU5BxCTYWXJLQMccQ== X-Received: by 2002:a05:600c:1c9c:b0:3d3:49db:9b25 with SMTP id k28-20020a05600c1c9c00b003d349db9b25mr25907435wms.26.1674583292242; Tue, 24 Jan 2023 10:01:32 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r18-20020a05600c435200b003db06224953sm2876741wme.41.2023.01.24.10.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 10:01:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 51C8D1FFBF; Tue, 24 Jan 2023 18:01:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Ed Maste , Thomas Huth , Alexandre Iooss , Markus Armbruster , Jagannathan Raman , John G Johnson , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Bandan Das , Elena Ufimtseva , Michael Roth , Eduardo Habkost , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Qiuhao Li , Stefan Hajnoczi , Alexander Bulekov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , Darren Kenny , qemu-arm@nongnu.org, Yanan Wang , Cleber Rosa , Wainer dos Santos Moschetta , Marcel Apfelbaum , Li-Wen Hsu , Peter Maydell Subject: [PATCH v2 07/35] meson: replace Perl usage with Python Date: Tue, 24 Jan 2023 18:00:59 +0000 Message-Id: <20230124180127.1881110-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124180127.1881110-1-alex.bennee@linaro.org> References: <20230124180127.1881110-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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]],