From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by mx.groups.io with SMTP id smtpd.web10.34731.1681664774949185153 for ; Sun, 16 Apr 2023 10:06:15 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=ipS6iYRE; spf=pass (domain: bsdio.com, ip: 66.111.4.29, mailfrom: rebecca@bsdio.com) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 4C6BB5C03A7; Sun, 16 Apr 2023 13:06:14 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 16 Apr 2023 13:06:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1681664774; x= 1681751174; bh=Drk5i+C2BVRgO0eDZyBBvXhJanSHQEI6o7NjcQjb+Do=; b=i pS6iYRE4Cio+Hm4S0UAoydW5hGl0dWXhrvYAKz4dm8B9blvLtwghekP/In8h4TPX WUov6+RVnx/89C9uotHvRtcYP9N6qnI/PrnCrwcnoaLpRWN1j/bJra+PMfKyaf70 KYjbb5KYr1yqBodMuQnUKQ1+5IfqP3gf/tDos0Cl4+ZpCzwTh2tBiuTeeAB+8LA9 jikqV0fBsUfvtJeky+nm5f2YCO7bzn59uDJqaDASTFjUyHBEJZ4WcTKFm2YpuAfT 5VcMbFcci6kLXyyOoYibC9EOtYO53447c5SCFhjh1h4ML/W3L71r/60AWBwiWYeP EqbWU6SGW48vrwpOUZ+1Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1681664774; x= 1681751174; bh=Drk5i+C2BVRgO0eDZyBBvXhJanSHQEI6o7NjcQjb+Do=; b=N tcvsdktD+VrFEZmvQfzasKgf+CRaQUJyXHUYXJiPnVL4Gh2SvpXkB00Rq8ry5Tml /snQIQP1mnvqLtOZYjvQs8LQkK6LAxIIbrz92QlvhehVpwuy9Nuo8+JE5TUhry26 t3JvagBYKC5eKmWtAWx/im7Re2NKjkmSDMbW8S2YWhOoaosA+hGG3TIVYoOH0SZ9 V8Gy/LuXGcfYaywp1BlMf9oh+dYEpvz+Ylx80aBErKQmOhpudUZ/ZEmBGtI4ayLJ dcpf4snRo9RIOJPYuVqHdp1iZwZfUW718c/gn4NhPjf2hsiyxHBWnU1oUhFS5R/I j92psavKUrBWAXpidtrMg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdelgedgieeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Apr 2023 13:06:12 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Liming Gao , Bob Feng , Yuwei Chen , Michael D Kinney , Michael Kubacki , Sean Brogan , Chasel Chiu , Nate DeSimone , Star Zeng , Andrew Fish , Ray Ni , Leif Lindholm , Zhiguang Liu , Jian J Wang , Xiaoyu Lu , Guomin Jiang , Gua Guo , Ard Biesheuvel , Pedro Falcato , Gerd Hoffmann , =?UTF-8?q?Marvin=20H=C3=A4user?= Cc: Rebecca Cran Subject: [PATCH v3 10/13] BaseTools: Only call LoadConfiguration once in build.py Date: Sun, 16 Apr 2023 11:05:29 -0600 Message-Id: <20230416170532.278338-11-rebecca@bsdio.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230416170532.278338-1-rebecca@bsdio.com> References: <20230416170532.278338-1-rebecca@bsdio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Avoid calling LoadConfiguration twice, in both InitPreBuild and InitBuild. Since InitPreBuild is called first, delete the second call from InitBuild. Signed-off-by: Rebecca Cran --- BaseTools/Source/Python/build/build.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index 51fb1f433eb7..8681b98776a9 100755 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -1002,9 +1002,6 @@ class Build(): # command line and target.txt, then get the final build configurations. # def InitBuild(self): - # parse target.txt, tools_def.txt, and platform file - self.LoadConfiguration() - # Allow case-insensitive for those from command line or configuration file ErrorCode, ErrorInfo = self.PlatformFile.Validate(".dsc", False) if ErrorCode != 0: @@ -1012,6 +1009,7 @@ class Build(): def InitPreBuild(self): + # parse target.txt, tools_def.txt, and platform file self.LoadConfiguration() ErrorCode, ErrorInfo = self.PlatformFile.Validate(".dsc", False) if ErrorCode != 0: -- 2.37.2