From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=52.95.48.154; helo=smtp-fw-6001.amazon.com; envelope-from=prvs=809865459=yeazelm@amazon.com; receiver=edk2-devel@lists.01.org Received: from smtp-fw-6001.amazon.com (smtp-fw-6001.amazon.com [52.95.48.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E09AF2114398F for ; Fri, 5 Oct 2018 10:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1538759589; x=1570295589; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=EWToc7WWrlL8LOxHIIQHaLAD0yzkG+JoQRqru4mM750=; b=rwvaUWUD0OMKIQfbXIwatZ0AnELhe03LHXHtgAx8uIyN0y5cmKt+WRLX NnxykjsKtVIJqlNq+ZxqLg+LIGgoJnAFo+QKV7/tInDH3KFx/9AQ/slIl CkAoBhSQRYhx4HrhLv8frotkGUyISl0+Agub+ruenkyBwXsiY9DmqensN g=; X-IronPort-AV: E=Sophos;i="5.54,345,1534809600"; d="scan'208";a="360870381" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1e-27fb8269.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 05 Oct 2018 17:13:08 +0000 Received: from u5065f33edf3958b8bbdc.ant.amazon.com (iad7-ws-svc-lb50-vlan3.amazon.com [10.0.93.214]) by email-inbound-relay-1e-27fb8269.us-east-1.amazon.com (8.14.7/8.14.7) with ESMTP id w95HD6mx064883 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 5 Oct 2018 17:13:07 GMT Received: from u5065f33edf3958b8bbdc.ant.amazon.com (localhost [127.0.0.1]) by u5065f33edf3958b8bbdc.ant.amazon.com (8.15.2/8.15.2/Debian-3) with ESMTP id w95HD6Wq031702; Fri, 5 Oct 2018 10:13:06 -0700 Received: (from yeazelm@localhost) by u5065f33edf3958b8bbdc.ant.amazon.com (8.15.2/8.15.2/Submit) id w95HD6sa031701; Fri, 5 Oct 2018 10:13:06 -0700 From: Matthew Yeazel To: edk2-devel@lists.01.org Cc: Matthew Yeazel Date: Fri, 5 Oct 2018 10:13:00 -0700 Message-Id: <38601194f721dcbf6c2b10c981e25714c073a854.1538756540.git.yeazelm@amazon.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [PATCH] BaseTools: Add support for dots in paths X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Oct 2018 17:13:10 -0000 Content-Transfer-Encoding: 8bit The split assumes that there isn't a dot in the path to the file but this isn't always the case. This will support more diverse paths. Contributed-under: TianoCore Contribution Agreement 1.1 Note: Section 3, paragraph 1, is read as an OR. Signed-off-by: Matthew Yeazel --- BaseTools/Source/Python/AutoGen/AutoGen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index eb1b283889..54ad4a5247 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -3062,7 +3062,7 @@ class ModuleAutoGen(AutoGen): self.BuildOption for SingleFile in FileList: if self.BuildRuleOrder and SingleFile.Ext in self.BuildRuleOrder and SingleFile.Ext in self.BuildRules: - key = SingleFile.Path.split(SingleFile.Ext)[0] + key = SingleFile.Path.rsplit(SingleFile.Ext, 1)[0] if key in Order_Dict: Order_Dict[key].append(SingleFile.Ext) else: -- 2.19.0