* [PATCH v1 1/4] BaseTools/GenMake: Use ToolDefinition as fallback option
2021-09-23 8:58 [PATCH v1 0/4] Set default Makefile name PierreGondois
@ 2021-09-23 8:59 ` PierreGondois
2021-09-23 8:59 ` [PATCH v1 2/4] BaseTools/build: Set MakefileName PierreGondois
` (6 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: PierreGondois @ 2021-09-23 8:59 UTC (permalink / raw)
To: devel, Bob Feng, Liming Gao, Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
Use the value set in tools_def.txt when the makefile type is
not explicitly set via BuildOption. This allows to have a
valid default makefile name instead of an empty string.
Also use GMAKE_FILETYPE instead of hard-coded "gmake".
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
BaseTools/Source/Python/AutoGen/GenMake.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 961b2ab1c399..e55efff059f9 100755
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -2,7 +2,7 @@
# Create makefile for MS nmake and GNU make
#
# Copyright (c) 2007 - 2021, Intel Corporation. All rights reserved.<BR>
-# Copyright (c) 2020, ARM Limited. All rights reserved.<BR>
+# Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -177,11 +177,11 @@ class BuildFile(object):
MakePath = AutoGenObject.BuildOption.get('MAKE', {}).get('PATH')
if not MakePath:
- self._FileType = ""
- elif "nmake" in MakePath:
+ MakePath = AutoGenObject.ToolDefinition.get('MAKE', {}).get('PATH')
+ if "nmake" in MakePath:
self._FileType = NMAKE_FILETYPE
else:
- self._FileType = "gmake"
+ self._FileType = GMAKE_FILETYPE
if sys.platform == "win32":
self._Platform = WIN32_PLATFORM
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v1 2/4] BaseTools/build: Set MakefileName
2021-09-23 8:58 [PATCH v1 0/4] Set default Makefile name PierreGondois
2021-09-23 8:59 ` [PATCH v1 1/4] BaseTools/GenMake: Use ToolDefinition as fallback option PierreGondois
@ 2021-09-23 8:59 ` PierreGondois
2021-09-23 8:59 ` [PATCH v1 3/4] BaseTools: Remove Makefile/MakefileName fields PierreGondois
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: PierreGondois @ 2021-09-23 8:59 UTC (permalink / raw)
To: devel, Bob Feng, Liming Gao, Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
Running the following command:
python3 build/build.py -a AARCH64 -t GCC5
-p ArmPlatformPkg/ArmPlatformPkg.dsc -b DEBUG libraries
triggers the following error:
make: *** Build/ArmPlatform/DEBUG_GCC5/AARCH64/MdePkg/Library/
BasePcdLibNull/BasePcdLibNull: Is a directory. Stop.
Indeed, MakefileName is set to en empty string. Setting MakefileName
resolves the error.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
BaseTools/Source/Python/build/build.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 02b489892422..58081361c38d 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -4,7 +4,7 @@
# Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>
# Copyright (c) 2007 - 2021, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.<BR>
-# Copyright (c) 2020, ARM Limited. All rights reserved.<BR>
+# Copyright (c) 2020 - 2021, ARM Limited. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -1308,6 +1308,9 @@ class Build():
if Target == 'run':
return True
+ # Fetch the MakeFileName.
+ self.MakeFileName = AutoGenObject.MakeFileName
+
# build modules
if BuildModule:
BuildCommand = BuildCommand + [Target]
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v1 3/4] BaseTools: Remove Makefile/MakefileName fields
2021-09-23 8:58 [PATCH v1 0/4] Set default Makefile name PierreGondois
2021-09-23 8:59 ` [PATCH v1 1/4] BaseTools/GenMake: Use ToolDefinition as fallback option PierreGondois
2021-09-23 8:59 ` [PATCH v1 2/4] BaseTools/build: Set MakefileName PierreGondois
@ 2021-09-23 8:59 ` PierreGondois
2021-09-23 8:59 ` [PATCH v1 4/4] BaseTools: Remove hard-coded strings for target and tools_def PierreGondois
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: PierreGondois @ 2021-09-23 8:59 UTC (permalink / raw)
To: devel, Bob Feng, Liming Gao, Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
The Makefile and MakefilName fields are never set/used. Remove them.
To check this, the following commands can be used:
- grep -rIn "\.Makefile"
- grep -rIn "\.MakefileName"
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 1 -
BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 --
BaseTools/Source/Python/build/build.py | 2 --
3 files changed, 5 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
index d70b0d7ae828..368a31047e82 100755
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
@@ -254,7 +254,6 @@ class ModuleAutoGen(AutoGen):
self.AutoGenDepSet = set()
self.ReferenceModules = []
self.ConstPcd = {}
- self.Makefile = None
self.FileDependCache = {}
def __init_platform_info__(self):
diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index 88a1d1582cd8..ef873720f455 100644
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -590,7 +590,6 @@ class PackageBuildClassObject(BuildData):
# @var OutputDirectory: To store value for OutputDirectory
# @var FlashDefinition: To store value for FlashDefinition
# @var BuildNumber: To store value for BuildNumber
-# @var MakefileName: To store value for MakefileName
# @var SkuIds: To store value for SkuIds, it is a set structure as
# { 'SkuName' : SkuId, '!include' : includefilename, ...}
# @var Modules: To store value for Modules, it is a list structure as
@@ -614,7 +613,6 @@ class PlatformBuildClassObject(BuildData):
self.OutputDirectory = ''
self.FlashDefinition = ''
self.BuildNumber = ''
- self.MakefileName = ''
self.SkuIds = {}
self.Modules = []
diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 58081361c38d..e4969d863f6e 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2186,8 +2186,6 @@ class Build():
Pa.CreateLibModuelDirs()
# Fetch the MakeFileName.
self.MakeFileName = Pa.MakeFileName
- if not self.MakeFileName:
- self.MakeFileName = Pa.MakeFile
Pa.DataPipe.DataContainer = {"LibraryBuildDirectoryList":Pa.LibraryBuildDirectoryList}
Pa.DataPipe.DataContainer = {"ModuleBuildDirectoryList":Pa.ModuleBuildDirectoryList}
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v1 4/4] BaseTools: Remove hard-coded strings for target and tools_def
2021-09-23 8:58 [PATCH v1 0/4] Set default Makefile name PierreGondois
` (2 preceding siblings ...)
2021-09-23 8:59 ` [PATCH v1 3/4] BaseTools: Remove Makefile/MakefileName fields PierreGondois
@ 2021-09-23 8:59 ` PierreGondois
2021-09-23 10:05 ` [edk2-devel] [PATCH v1 0/4] Set default Makefile name Chris Jones
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: PierreGondois @ 2021-09-23 8:59 UTC (permalink / raw)
To: devel, Bob Feng, Liming Gao, Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
The "target.txt" and "tools_def.txt" filenames are hard-coded
at some places when global definitions are available at:
BaseTools/Source/Python/Common/TargetTxtClassObject.py:
DefaultTargetTxtFile
and
BaseTools/Source/Python/Common/ToolDefClassObject.py:
DefaultToolsDefFile
Use these global definitions instead.
Also remove the unused gBuildConfiguration and gToolsDefinition
variables from build.py
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
BaseTools/Source/Python/GenFds/GenFds.py | 4 ++--
BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++--
BaseTools/Source/Python/TargetTool/TargetTool.py | 3 ++-
BaseTools/Source/Python/Workspace/DscBuildData.py | 9 ++++-----
BaseTools/Source/Python/build/build.py | 4 ----
5 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index ae3e776a5540..c34104500059 100644
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -20,7 +20,7 @@ from linecache import getlines
from io import BytesIO
import Common.LongFilePathOs as os
-from Common.TargetTxtClassObject import TargetTxtDict
+from Common.TargetTxtClassObject import TargetTxtDict,gDefaultTargetTxtFile
from Common.DataType import *
import Common.GlobalData as GlobalData
from Common import EdkLogger
@@ -207,7 +207,7 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None):
GenFdsGlobalVariable.ConfDir = ConfDirectoryPath
if not GlobalData.gConfDirectory:
GlobalData.gConfDirectory = GenFdsGlobalVariable.ConfDir
- BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, "target.txt"))
+ BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, gDefaultTargetTxtFile))
if os.path.isfile(BuildConfigurationFile) == True:
# if no build target given in command line, get it from target.txt
TargetObj = TargetTxtDict()
diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 25f9d54874d3..d7668ba681aa 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -24,7 +24,7 @@ from Common import EdkLogger
from Common.Misc import SaveFileOnChange
from Common.TargetTxtClassObject import TargetTxtDict
-from Common.ToolDefClassObject import ToolDefDict
+from Common.ToolDefClassObject import ToolDefDict,gDefaultToolsDefFile
from AutoGen.BuildEngine import ToolBuildRule
import Common.DataType as DataType
from Common.Misc import PathClass,CreateDirectory
@@ -103,7 +103,7 @@ class GenFdsGlobalVariable:
TargetObj = TargetTxtDict()
ToolDefinitionFile = TargetObj.Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]
if ToolDefinitionFile == '':
- ToolDefinitionFile = "Conf/tools_def.txt"
+ ToolDefinitionFile = os.path.join('Conf', gDefaultToolsDefFile)
if os.path.isfile(ToolDefinitionFile):
ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))
ToolDefinition = ToolDefObj.ToolDef.ToolsDefTxtDatabase
diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/Source/Python/TargetTool/TargetTool.py
index 71222e3cc899..7f2479f0f0ac 100644
--- a/BaseTools/Source/Python/TargetTool/TargetTool.py
+++ b/BaseTools/Source/Python/TargetTool/TargetTool.py
@@ -17,6 +17,7 @@ import Common.BuildToolError as BuildToolError
from Common.DataType import *
from Common.BuildVersion import gBUILD_VERSION
from Common.LongFilePathSupport import OpenLongFilePath as open
+from Common.TargetTxtClassObject import gDefaultTargetTxtFile
# To Do 1.set clean, 2. add item, if the line is disabled.
@@ -25,7 +26,7 @@ class TargetTool():
self.WorkSpace = os.path.normpath(os.getenv('WORKSPACE'))
self.Opt = opt
self.Arg = args[0]
- self.FileName = os.path.normpath(os.path.join(self.WorkSpace, 'Conf', 'target.txt'))
+ self.FileName = os.path.normpath(os.path.join(self.WorkSpace, 'Conf', gDefaultTargetTxtFile))
if os.path.isfile(self.FileName) == False:
print("%s does not exist." % self.FileName)
sys.exit(1)
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 4d5b1ad4d90a..d1ee0ccaea7e 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -19,8 +19,8 @@ from Common.Misc import *
from types import *
from Common.Expression import *
from CommonDataClass.CommonClass import SkuInfoClass
-from Common.TargetTxtClassObject import TargetTxtDict
-from Common.ToolDefClassObject import ToolDefDict
+from Common.TargetTxtClassObject import TargetTxtDict,gDefaultTargetTxtFile
+from Common.ToolDefClassObject import ToolDefDict,gDefaultToolsDefFile
from .MetaDataTable import *
from .MetaFileTable import *
from .MetaFileParser import *
@@ -3526,12 +3526,11 @@ class DscBuildData(PlatformBuildClassObject):
self._ToolChainFamily = TAB_COMPILER_MSFT
TargetObj = TargetTxtDict()
TargetTxt = TargetObj.Target
- BuildConfigurationFile = os.path.normpath(os.path.join(GlobalData.gConfDirectory, "target.txt"))
+ BuildConfigurationFile = os.path.normpath(os.path.join(GlobalData.gConfDirectory, gDefaultTargetTxtFile))
if os.path.isfile(BuildConfigurationFile) == True:
ToolDefinitionFile = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]
if ToolDefinitionFile == '':
- ToolDefinitionFile = "tools_def.txt"
- ToolDefinitionFile = os.path.normpath(mws.join(self.WorkspaceDir, 'Conf', ToolDefinitionFile))
+ ToolDefinitionFile = os.path.normpath(mws.join(self.WorkspaceDir, 'Conf', gDefaultToolsDefFile))
if os.path.isfile(ToolDefinitionFile) == True:
ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))
ToolDefinition = ToolDefObj.ToolDef.ToolsDefTxtDatabase
diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index e4969d863f6e..07187c03618a 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -67,10 +67,6 @@ from AutoGen.AutoGen import CalculatePriorityValue
## standard targets of build command
gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run']
-## build configuration file
-gBuildConfiguration = "target.txt"
-gToolsDefinition = "tools_def.txt"
-
TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$')
TmpTableDict = {}
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [edk2-devel] [PATCH v1 0/4] Set default Makefile name
2021-09-23 8:58 [PATCH v1 0/4] Set default Makefile name PierreGondois
` (3 preceding siblings ...)
2021-09-23 8:59 ` [PATCH v1 4/4] BaseTools: Remove hard-coded strings for target and tools_def PierreGondois
@ 2021-09-23 10:05 ` Chris Jones
2021-09-24 0:48 ` 回复: " gaoliming
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Chris Jones @ 2021-09-23 10:05 UTC (permalink / raw)
To: devel@edk2.groups.io, Bob Feng, Liming Gao, Sami Mujawar,
Pierre Gondois
[-- Attachment #1: Type: text/plain, Size: 2149 bytes --]
For this patch series:
Reviewed-by: Chris Jones <christopher.jones@arm.com>
Regards,
Chris
________________________________
From: devel@edk2.groups.io <devel@edk2.groups.io> on behalf of PierreGondois via groups.io <pierre.gondois=arm.com@groups.io>
Sent: Thursday, September 23, 2021 9:58 AM
To: devel@edk2.groups.io <devel@edk2.groups.io>; Bob Feng <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Sami Mujawar <Sami.Mujawar@arm.com>
Subject: [edk2-devel] [PATCH v1 0/4] Set default Makefile name
From: Pierre Gondois <Pierre.Gondois@arm.com>
A Makefile name is not set in BaseTools when only building modules
or libraries. This patch-set sets a default Makefile name for the
"build" command.
The patch-set also:
- Removes unsused Makefile variables
- Removes hard-coded references to "target.txt" and "tools_def.txt"
The changes can be seen at: https://github.com/PierreARM/edk2/tree/1868_BaseTools_build_py_corrections_v1
Pierre Gondois (4):
BaseTools/GenMake: Use ToolDefinition as fallback option
BaseTools/build: Set MakefileName
BaseTools: Remove Makefile/MakefileName fields
BaseTools: Remove hard-coded strings for target and tools_def
BaseTools/Source/Python/AutoGen/GenMake.py | 8 ++++----
BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 1 -
BaseTools/Source/Python/GenFds/GenFds.py | 4 ++--
.../Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++--
BaseTools/Source/Python/TargetTool/TargetTool.py | 3 ++-
BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 --
BaseTools/Source/Python/Workspace/DscBuildData.py | 9 ++++-----
BaseTools/Source/Python/build/build.py | 11 ++++-------
8 files changed, 18 insertions(+), 24 deletions(-)
--
2.17.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
[-- Attachment #2: Type: text/html, Size: 4514 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread* 回复: [PATCH v1 0/4] Set default Makefile name
2021-09-23 8:58 [PATCH v1 0/4] Set default Makefile name PierreGondois
` (4 preceding siblings ...)
2021-09-23 10:05 ` [edk2-devel] [PATCH v1 0/4] Set default Makefile name Chris Jones
@ 2021-09-24 0:48 ` gaoliming
2021-09-24 11:57 ` PierreGondois
2021-09-29 11:43 ` Bob Feng
[not found] ` <16A94849D004DAA5.16095@groups.io>
7 siblings, 1 reply; 11+ messages in thread
From: gaoliming @ 2021-09-24 0:48 UTC (permalink / raw)
To: Pierre.Gondois, devel, 'Bob Feng', 'Sami Mujawar'
Pierre:
Can you submit BZ for this change request?
Thanks
Liming
> -----邮件原件-----
> 发件人: Pierre.Gondois@arm.com <Pierre.Gondois@arm.com>
> 发送时间: 2021年9月23日 16:59
> 收件人: devel@edk2.groups.io; Bob Feng <bob.c.feng@intel.com>; Liming
> Gao <gaoliming@byosoft.com.cn>; Sami Mujawar <sami.mujawar@arm.com>
> 主题: [PATCH v1 0/4] Set default Makefile name
>
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> A Makefile name is not set in BaseTools when only building modules
> or libraries. This patch-set sets a default Makefile name for the
> "build" command.
>
> The patch-set also:
> - Removes unsused Makefile variables
> - Removes hard-coded references to "target.txt" and "tools_def.txt"
>
> The changes can be seen at:
> https://github.com/PierreARM/edk2/tree/1868_BaseTools_build_py_correcti
> ons_v1
>
> Pierre Gondois (4):
> BaseTools/GenMake: Use ToolDefinition as fallback option
> BaseTools/build: Set MakefileName
> BaseTools: Remove Makefile/MakefileName fields
> BaseTools: Remove hard-coded strings for target and tools_def
>
> BaseTools/Source/Python/AutoGen/GenMake.py | 8
> ++++----
> BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 1 -
> BaseTools/Source/Python/GenFds/GenFds.py | 4 ++--
> .../Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++--
> BaseTools/Source/Python/TargetTool/TargetTool.py | 3 ++-
> BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 --
> BaseTools/Source/Python/Workspace/DscBuildData.py | 9 ++++-----
> BaseTools/Source/Python/build/build.py | 11 ++++-------
> 8 files changed, 18 insertions(+), 24 deletions(-)
>
> --
> 2.17.1
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: 回复: [PATCH v1 0/4] Set default Makefile name
2021-09-24 0:48 ` 回复: " gaoliming
@ 2021-09-24 11:57 ` PierreGondois
2021-09-29 1:35 ` 回复: [edk2-devel] " gaoliming
0 siblings, 1 reply; 11+ messages in thread
From: PierreGondois @ 2021-09-24 11:57 UTC (permalink / raw)
To: gaoliming, devel, 'Bob Feng', 'Sami Mujawar'
Cc: 'Christopher Jones'
Hi Liming,
I created: https://bugzilla.tianocore.org/show_bug.cgi?id=3653
Regards,
Pierre
On 9/24/21 1:48 AM, gaoliming wrote:
> Pierre:
> Can you submit BZ for this change request?
>
> Thanks
> Liming
>> -----邮件原件-----
>> 发件人: Pierre.Gondois@arm.com <Pierre.Gondois@arm.com>
>> 发送时间: 2021年9月23日 16:59
>> 收件人: devel@edk2.groups.io; Bob Feng <bob.c.feng@intel.com>; Liming
>> Gao <gaoliming@byosoft.com.cn>; Sami Mujawar <sami.mujawar@arm.com>
>> 主题: [PATCH v1 0/4] Set default Makefile name
>>
>> From: Pierre Gondois <Pierre.Gondois@arm.com>
>>
>> A Makefile name is not set in BaseTools when only building modules
>> or libraries. This patch-set sets a default Makefile name for the
>> "build" command.
>>
>> The patch-set also:
>> - Removes unsused Makefile variables
>> - Removes hard-coded references to "target.txt" and "tools_def.txt"
>>
>> The changes can be seen at:
>> https://github.com/PierreARM/edk2/tree/1868_BaseTools_build_py_correcti
>> ons_v1
>>
>> Pierre Gondois (4):
>> BaseTools/GenMake: Use ToolDefinition as fallback option
>> BaseTools/build: Set MakefileName
>> BaseTools: Remove Makefile/MakefileName fields
>> BaseTools: Remove hard-coded strings for target and tools_def
>>
>> BaseTools/Source/Python/AutoGen/GenMake.py | 8
>> ++++----
>> BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 1 -
>> BaseTools/Source/Python/GenFds/GenFds.py | 4 ++--
>> .../Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++--
>> BaseTools/Source/Python/TargetTool/TargetTool.py | 3 ++-
>> BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 --
>> BaseTools/Source/Python/Workspace/DscBuildData.py | 9 ++++-----
>> BaseTools/Source/Python/build/build.py | 11 ++++-------
>> 8 files changed, 18 insertions(+), 24 deletions(-)
>>
>> --
>> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* 回复: [edk2-devel] 回复: [PATCH v1 0/4] Set default Makefile name
2021-09-24 11:57 ` PierreGondois
@ 2021-09-29 1:35 ` gaoliming
0 siblings, 0 replies; 11+ messages in thread
From: gaoliming @ 2021-09-29 1:35 UTC (permalink / raw)
To: devel, pierre.gondois, 'Bob Feng', 'Sami Mujawar'
Cc: 'Christopher Jones'
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表
> PierreGondois
> 发送时间: 2021年9月24日 19:57
> 收件人: gaoliming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io; 'Bob
> Feng' <bob.c.feng@intel.com>; 'Sami Mujawar' <sami.mujawar@arm.com>
> 抄送: 'Christopher Jones' <Christopher.Jones@arm.com>
> 主题: Re: [edk2-devel] 回复: [PATCH v1 0/4] Set default Makefile name
>
> Hi Liming,
>
> I created: https://bugzilla.tianocore.org/show_bug.cgi?id=3653
>
> Regards,
>
> Pierre
>
> On 9/24/21 1:48 AM, gaoliming wrote:
> > Pierre:
> > Can you submit BZ for this change request?
> >
> > Thanks
> > Liming
> >> -----邮件原件-----
> >> 发件人: Pierre.Gondois@arm.com <Pierre.Gondois@arm.com>
> >> 发送时间: 2021年9月23日 16:59
> >> 收件人: devel@edk2.groups.io; Bob Feng <bob.c.feng@intel.com>;
> Liming
> >> Gao <gaoliming@byosoft.com.cn>; Sami Mujawar
> <sami.mujawar@arm.com>
> >> 主题: [PATCH v1 0/4] Set default Makefile name
> >>
> >> From: Pierre Gondois <Pierre.Gondois@arm.com>
> >>
> >> A Makefile name is not set in BaseTools when only building modules
> >> or libraries. This patch-set sets a default Makefile name for the
> >> "build" command.
> >>
> >> The patch-set also:
> >> - Removes unsused Makefile variables
> >> - Removes hard-coded references to "target.txt" and "tools_def.txt"
> >>
> >> The changes can be seen at:
> >>
> https://github.com/PierreARM/edk2/tree/1868_BaseTools_build_py_correcti
> >> ons_v1
> >>
> >> Pierre Gondois (4):
> >> BaseTools/GenMake: Use ToolDefinition as fallback option
> >> BaseTools/build: Set MakefileName
> >> BaseTools: Remove Makefile/MakefileName fields
> >> BaseTools: Remove hard-coded strings for target and tools_def
> >>
> >> BaseTools/Source/Python/AutoGen/GenMake.py | 8
> >> ++++----
> >> BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 1 -
> >> BaseTools/Source/Python/GenFds/GenFds.py | 4 ++--
> >> .../Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++--
> >> BaseTools/Source/Python/TargetTool/TargetTool.py | 3 ++-
> >> BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 --
> >> BaseTools/Source/Python/Workspace/DscBuildData.py | 9
> ++++-----
> >> BaseTools/Source/Python/build/build.py | 11
> ++++-------
> >> 8 files changed, 18 insertions(+), 24 deletions(-)
> >>
> >> --
> >> 2.17.1
> >
> >
> >
> >
>
>
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v1 0/4] Set default Makefile name
2021-09-23 8:58 [PATCH v1 0/4] Set default Makefile name PierreGondois
` (5 preceding siblings ...)
2021-09-24 0:48 ` 回复: " gaoliming
@ 2021-09-29 11:43 ` Bob Feng
[not found] ` <16A94849D004DAA5.16095@groups.io>
7 siblings, 0 replies; 11+ messages in thread
From: Bob Feng @ 2021-09-29 11:43 UTC (permalink / raw)
To: Pierre.Gondois@arm.com, devel@edk2.groups.io, Liming Gao,
Sami Mujawar
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-----Original Message-----
From: Pierre.Gondois@arm.com <Pierre.Gondois@arm.com>
Sent: Thursday, September 23, 2021 4:59 PM
To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Sami Mujawar <sami.mujawar@arm.com>
Subject: [PATCH v1 0/4] Set default Makefile name
From: Pierre Gondois <Pierre.Gondois@arm.com>
A Makefile name is not set in BaseTools when only building modules or libraries. This patch-set sets a default Makefile name for the "build" command.
The patch-set also:
- Removes unsused Makefile variables
- Removes hard-coded references to "target.txt" and "tools_def.txt"
The changes can be seen at: https://github.com/PierreARM/edk2/tree/1868_BaseTools_build_py_corrections_v1
Pierre Gondois (4):
BaseTools/GenMake: Use ToolDefinition as fallback option
BaseTools/build: Set MakefileName
BaseTools: Remove Makefile/MakefileName fields
BaseTools: Remove hard-coded strings for target and tools_def
BaseTools/Source/Python/AutoGen/GenMake.py | 8 ++++----
BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 1 -
BaseTools/Source/Python/GenFds/GenFds.py | 4 ++--
.../Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++--
BaseTools/Source/Python/TargetTool/TargetTool.py | 3 ++-
BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 --
BaseTools/Source/Python/Workspace/DscBuildData.py | 9 ++++-----
BaseTools/Source/Python/build/build.py | 11 ++++-------
8 files changed, 18 insertions(+), 24 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 11+ messages in thread[parent not found: <16A94849D004DAA5.16095@groups.io>]
* Re: [edk2-devel] [PATCH v1 0/4] Set default Makefile name
[not found] ` <16A94849D004DAA5.16095@groups.io>
@ 2021-09-29 11:53 ` Bob Feng
0 siblings, 0 replies; 11+ messages in thread
From: Bob Feng @ 2021-09-29 11:53 UTC (permalink / raw)
To: devel@edk2.groups.io, Feng, Bob C, Pierre.Gondois@arm.com,
Liming Gao, Sami Mujawar
Create a PR https://github.com/tianocore/edk2/pull/2030
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bob Feng
Sent: Wednesday, September 29, 2021 7:44 PM
To: Pierre.Gondois@arm.com; devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Sami Mujawar <sami.mujawar@arm.com>
Subject: Re: [edk2-devel] [PATCH v1 0/4] Set default Makefile name
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-----Original Message-----
From: Pierre.Gondois@arm.com <Pierre.Gondois@arm.com>
Sent: Thursday, September 23, 2021 4:59 PM
To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Sami Mujawar <sami.mujawar@arm.com>
Subject: [PATCH v1 0/4] Set default Makefile name
From: Pierre Gondois <Pierre.Gondois@arm.com>
A Makefile name is not set in BaseTools when only building modules or libraries. This patch-set sets a default Makefile name for the "build" command.
The patch-set also:
- Removes unsused Makefile variables
- Removes hard-coded references to "target.txt" and "tools_def.txt"
The changes can be seen at: https://github.com/PierreARM/edk2/tree/1868_BaseTools_build_py_corrections_v1
Pierre Gondois (4):
BaseTools/GenMake: Use ToolDefinition as fallback option
BaseTools/build: Set MakefileName
BaseTools: Remove Makefile/MakefileName fields
BaseTools: Remove hard-coded strings for target and tools_def
BaseTools/Source/Python/AutoGen/GenMake.py | 8 ++++----
BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 1 -
BaseTools/Source/Python/GenFds/GenFds.py | 4 ++--
.../Source/Python/GenFds/GenFdsGlobalVariable.py | 4 ++--
BaseTools/Source/Python/TargetTool/TargetTool.py | 3 ++-
BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 --
BaseTools/Source/Python/Workspace/DscBuildData.py | 9 ++++-----
BaseTools/Source/Python/build/build.py | 11 ++++-------
8 files changed, 18 insertions(+), 24 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 11+ messages in thread