From patchwork Wed Aug 26 11:33:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 1351823 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=UD9cOa/a; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bc3gY68FFz9sTQ for ; Wed, 26 Aug 2020 21:35:05 +1000 (AEST) Received: from localhost ([::1]:57436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAthn-00041Y-QR for incoming@patchwork.ozlabs.org; Wed, 26 Aug 2020 07:35:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtgr-0002tY-Bx for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:05 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:35742) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAtgp-0006hJ-M9 for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:05 -0400 Received: by mail-pg1-x544.google.com with SMTP id o5so903039pgb.2 for ; Wed, 26 Aug 2020 04:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nHEmWVZQoKiBv31d0b1nWAUGSiNgf5i9gDUSz3OTqd8=; b=UD9cOa/a47vPa6dJ1ilncNdjvMU112NkxIte03WY+6qrSWCP+ysQaBLpsUbtEITezO GooWbTavYASJP/x8QSp2uJh3bIMn4DifApS3o1sIx3QylRgXZyoW94GJ/QDyIo4dukrr kCim66fs6/oqMuTsTZtFlJJA6DXh12WLEGl4g+8qCwqFH5AHJhNSnW68BVyATZ5CO5Gt dl7QVf9T9wq7TVARFJsKgXI7hAWaCm1lLHy4ZeAvLNK2bilR/rD4AoaL2G6oUbfb/yJo hIkV85g0YtdLXpj/x7hzvhXp2XmRBQNc+gFQZx1k2jeXlMbUlBB/wGX14x+WvQlkwg2Q jEjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nHEmWVZQoKiBv31d0b1nWAUGSiNgf5i9gDUSz3OTqd8=; b=baixsrNYR4jIi+DSxgMwUNSX8T58/uXA071+DfNUOGs+0AEpvY/y9d9rzw7xbsD+rS IjXdW96YEAd28zWNN+hg/fE3Mam54P92m/ZXVWllgOanvNjaNTKlUwh7m9ZLH2pEwiS5 h2bbgniw35PoWeiOgelFoL8ok7Ui1fLHjKO6yHI0VZ51G3GY9oq2DK7Y0SvRI8vz0+P5 NmuXNfs1ot0XF3M5SW0ZrCJDZ+reg1gQUu3/zyTMv2mSHYi03gRcLBRxMrptZHQiTP8s tZ9RS/IktUOkVX+aXbBcpqxeSAQHr6Ej2+KOdUzvVWPB5O8YXGH+52zizfHNLDYFDDyT MUpw== X-Gm-Message-State: AOAM5300FuQ4RWDklxFL8KubwJfOs590SMSJa3+/TUzs/khXdRqRGGdB 90p2OJ6c93his41BLrsOIILaffeGzN8kmeQy X-Google-Smtp-Source: ABdhPJyYo7308n1g7FMHCagGy2xTCPEiZc2hnY40vH2WXOVo9fniG0ZeWKl1IfVrSNfDSZOzP379Nw== X-Received: by 2002:a63:1704:: with SMTP id x4mr9761293pgl.186.1598441641561; Wed, 26 Aug 2020 04:34:01 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id p20sm1915914pjz.49.2020.08.26.04.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 04:34:00 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v4 1/5] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja Date: Wed, 26 Aug 2020 19:33:22 +0800 Message-Id: <20200826113326.491-1-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::544; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Yonggang Luo , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched if the path are start with C:/ and E:/ Signed-off-by: Yonggang Luo --- scripts/ninjatool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py index cc77d51aa8..6ca8be6f10 100755 --- a/scripts/ninjatool.py +++ b/scripts/ninjatool.py @@ -55,7 +55,7 @@ else: PATH_RE = r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}" -SIMPLE_PATH_RE = re.compile(r"[^$\s:|]+") +SIMPLE_PATH_RE = re.compile(r"^[^$\s:|]+$") IDENT_RE = re.compile(r"[a-zA-Z0-9_.-]+$") STRING_RE = re.compile(r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?|.") TOPLEVEL_RE = re.compile(r"([=:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*|.")