From patchwork Tue Aug 25 16:53:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 1351167 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=RRFNh/Ch; 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 4BbZpW72gpz9sTY for ; Wed, 26 Aug 2020 02:54:27 +1000 (AEST) Received: from localhost ([::1]:54704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAcDJ-00016x-VC for incoming@patchwork.ozlabs.org; Tue, 25 Aug 2020 12:54:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAcCz-00016d-MI for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:54:05 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:36585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAcCy-0003eQ-4w for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:54:05 -0400 Received: by mail-pg1-x542.google.com with SMTP id p37so7238471pgl.3 for ; Tue, 25 Aug 2020 09:54: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=MU1D0gcoO3ZaMdBitGLyuB0vQmL5fSRzDQyIOcmupWk=; b=RRFNh/ChKXSx1pXId/0QVXP/LMduMWDUJIHuK6jYKuSZ2EzJrIgJi3qIeWTFfYUn1+ lWaJ36Vu8r+3BoSvtZcD2FNMxnR/7TZe/hfdedT8HlI9Pfu6LIFcNuMP8xUCasJLnQLF gACyQkw+YfEuRzGJFcb68Ls2DbdijzL9e5rdAtNRLi40oLKFZGXNM2klN6NrmJHS6VLT SwDBPiHrZpqTxVYU0GKxMSCt+FVEbE2UY7gfy6F0nzrgB6JCbvCAaRXqpwBXgEHF7cKm qipeusQN/EzlTBNeacItXBURg+jKvrSJvqEGuLbNVPVXohaphJqfx9DvJbFnSraaz0FQ NrbA== 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=MU1D0gcoO3ZaMdBitGLyuB0vQmL5fSRzDQyIOcmupWk=; b=fcdRNDnbjSjxgCaZNR7u/2ajsxgZexP0PRoM1b+8aS7zqAsO1vo9RYmACo0F7utANt nLKkoTJfAwtH4KFtht/BABtJvFViwP7vyvwihmzEZITykGXUnv7jyBqLEdb0OhnlpqaM TOUeIvFxRcO3wiXRrqRf97ECalniO3olz99+jj6Ae843PXGavUMQoYfreTEBT6AtNNqo VAv/dsxMjlWSBLDXJ0k6M7vWmH4SOfS5amcaOEKDNrAAWTet5X9jlAwiYGM5gEIRUn2c HTgkgQU8moRKnlxCVzrDkgGgpt4eYjqZ8QB3BW8WiqHJHB/IukYsMJXOeKP0ZeY1jYYu T3DA== X-Gm-Message-State: AOAM530h60fOQ3p+KE4zCMkJVzgPEVNz9DjHycLRMQeYhlKzLQrBNsi8 wdAjT5soqbRRrrnDMzwmbwvGse00Taw407c7y+A= X-Google-Smtp-Source: ABdhPJyQXihYc/eTsNGoXFyGE7HRBDtkIBYc3lNGwLBK2AuqdSQhiOthiH5tZqFKR3ANjo34pgw2FA== X-Received: by 2002:a05:6a00:15cb:: with SMTP id o11mr8477923pfu.263.1598374441891; Tue, 25 Aug 2020 09:54:01 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id 193sm15988527pfu.169.2020.08.25.09.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 09:54:01 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja Date: Wed, 26 Aug 2020 00:53:38 +0800 Message-Id: <20200825165341.520-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::542; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x542.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?b?RGFuaWVsIFAgLiBCZXJyYW5n6IyF?= 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:/ --- 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*|.")