BaseTools/Source/Python: New Target/ToolChain/Arch in DSC [BuildOptions]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3359

Update BaseTools to support new build targets, new tool chains,
and new architectures declared in DSC file [BuildOptions] sections.

* Do not expand * when tools_def.txt is parsed.  Only expand when
  both tools_def.txt and DSC [BuilsOptions] sections have been parsed.
  This also requires more flexible matching of tool keys that contain *
  in tool key fields.

* Pre-scan the platform DSC file for FAMILY and TOOLCHAIN declarations
  DSC in [BuildOptions] sections before the FAMILY and TOOLCHAIN need
  to be known.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

1 files changed, 78 insertions, 33 deletions

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index c4cfe38ad9..0570c29f1a 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2,7 +2,7 @@
 # build a platform or a module

 #

 #  Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>

-#  Copyright (c) 2007 - 2020, Intel Corporation. All rights reserved.<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>

 #

@@ -889,6 +889,47 @@ class Build():
         except:

             return False, UNKNOWN_ERROR

 

+    ## Add TOOLCHAIN and FAMILY declared in DSC [BuildOptions] to ToolsDefTxtDatabase.

+    #

+    # Loop through the set of build targets, tool chains, and archs provided on either

+    # the command line or in target.txt to discover FAMILY and TOOLCHAIN delclarations

+    # in [BuildOptions] sections that may be within !if expressions that may use

+    # $(TARGET), $(TOOLCHAIN), $(TOOLCHAIN_TAG), or $(ARCH) operands.

+    #

+    def GetToolChainAndFamilyFromDsc (self, File):

+        for BuildTarget in self.BuildTargetList:

+            GlobalData.gGlobalDefines['TARGET'] = BuildTarget

+            for BuildToolChain in self.ToolChainList:

+                GlobalData.gGlobalDefines['TOOLCHAIN']      = BuildToolChain

+                GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = BuildToolChain

+                for BuildArch in self.ArchList:

+                    GlobalData.gGlobalDefines['ARCH'] = BuildArch

+                    dscobj = self.BuildDatabase[File, BuildArch]

+                    for KeyFamily, Key, KeyCodeBase in dscobj.BuildOptions:

+                        try:

+                            Target, ToolChain, Arch, Tool, Attr = Key.split('_')

+                        except:

+                            continue

+                        if ToolChain == TAB_STAR or Attr != TAB_TOD_DEFINES_FAMILY:

+                            continue

+                        try:

+                            Family = dscobj.BuildOptions[(KeyFamily, Key, KeyCodeBase)]

+                            Family = Family.strip().strip('=').strip()

+                        except:

+                            continue

+                        if TAB_TOD_DEFINES_FAMILY not in self.ToolDef.ToolsDefTxtDatabase:

+                            self.ToolDef.ToolsDefTxtDatabase[TAB_TOD_DEFINES_FAMILY] = {}

+                        if ToolChain not in self.ToolDef.ToolsDefTxtDatabase[TAB_TOD_DEFINES_FAMILY]:

+                            self.ToolDef.ToolsDefTxtDatabase[TAB_TOD_DEFINES_FAMILY][ToolChain] = Family

+                        if TAB_TOD_DEFINES_BUILDRULEFAMILY not in self.ToolDef.ToolsDefTxtDatabase:

+                            self.ToolDef.ToolsDefTxtDatabase[TAB_TOD_DEFINES_BUILDRULEFAMILY] = {}

+                        if ToolChain not in self.ToolDef.ToolsDefTxtDatabase[TAB_TOD_DEFINES_BUILDRULEFAMILY]:

+                            self.ToolDef.ToolsDefTxtDatabase[TAB_TOD_DEFINES_BUILDRULEFAMILY][ToolChain] = Family

+                        if TAB_TOD_DEFINES_TOOL_CHAIN_TAG not in self.ToolDef.ToolsDefTxtDatabase:

+                            self.ToolDef.ToolsDefTxtDatabase[TAB_TOD_DEFINES_TOOL_CHAIN_TAG] = []

+                        if ToolChain not in self.ToolDef.ToolsDefTxtDatabase[TAB_TOD_DEFINES_TOOL_CHAIN_TAG]:

+                            self.ToolDef.ToolsDefTxtDatabase[TAB_TOD_DEFINES_TOOL_CHAIN_TAG].append(ToolChain)

+

     ## Load configuration

     #

     #   This method will parse target.txt and get the build configurations.

@@ -910,6 +951,26 @@ class Build():
             if self.ToolChainList is None or len(self.ToolChainList) == 0:

                 EdkLogger.error("build", RESOURCE_NOT_AVAILABLE, ExtraData="No toolchain given. Don't know how to build.\n")

 

+        if not self.PlatformFile:

+            PlatformFile = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_ACTIVE_PLATFORM]

+            if not PlatformFile:

+                # Try to find one in current directory

+                WorkingDirectory = os.getcwd()

+                FileList = glob.glob(os.path.normpath(os.path.join(WorkingDirectory, '*.dsc')))

+                FileNum = len(FileList)

+                if FileNum >= 2:

+                    EdkLogger.error("build", OPTION_MISSING,

+                                    ExtraData="There are %d DSC files in %s. Use '-p' to specify one.\n" % (FileNum, WorkingDirectory))

+                elif FileNum == 1:

+                    PlatformFile = FileList[0]

+                else:

+                    EdkLogger.error("build", RESOURCE_NOT_AVAILABLE,

+                                    ExtraData="No active platform specified in target.txt or command line! Nothing can be built.\n")

+

+            self.PlatformFile = PathClass(NormFile(PlatformFile, self.WorkspaceDir), self.WorkspaceDir)

+

+        self.GetToolChainAndFamilyFromDsc (self.PlatformFile)

+

         # check if the tool chains are defined or not

         NewToolChainList = []

         for ToolChain in self.ToolChainList:

@@ -935,23 +996,6 @@ class Build():
                 ToolChainFamily.append(ToolDefinition[TAB_TOD_DEFINES_FAMILY][Tool])

         self.ToolChainFamily = ToolChainFamily

 

-        if not self.PlatformFile:

-            PlatformFile = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_ACTIVE_PLATFORM]

-            if not PlatformFile:

-                # Try to find one in current directory

-                WorkingDirectory = os.getcwd()

-                FileList = glob.glob(os.path.normpath(os.path.join(WorkingDirectory, '*.dsc')))

-                FileNum = len(FileList)

-                if FileNum >= 2:

-                    EdkLogger.error("build", OPTION_MISSING,

-                                    ExtraData="There are %d DSC files in %s. Use '-p' to specify one.\n" % (FileNum, WorkingDirectory))

-                elif FileNum == 1:

-                    PlatformFile = FileList[0]

-                else:

-                    EdkLogger.error("build", RESOURCE_NOT_AVAILABLE,

-                                    ExtraData="No active platform specified in target.txt or command line! Nothing can be built.\n")

-

-            self.PlatformFile = PathClass(NormFile(PlatformFile, self.WorkspaceDir), self.WorkspaceDir)

         self.ThreadNumber   = ThreadNum()

     ## Initialize build configuration

     #

@@ -2381,24 +2425,25 @@ class Build():
                     continue

 

                 for Arch in self.ArchList:

-                    # Build up the list of supported architectures for this build

-                    prefix = '%s_%s_%s_' % (BuildTarget, ToolChain, Arch)

-

                     # Look through the tool definitions for GUIDed tools

                     guidAttribs = []

                     for (attrib, value) in self.ToolDef.ToolsDefTxtDictionary.items():

-                        if attrib.upper().endswith('_GUID'):

-                            split = attrib.split('_')

-                            thisPrefix = '_'.join(split[0:3]) + '_'

-                            if thisPrefix == prefix:

-                                guid = self.ToolDef.ToolsDefTxtDictionary[attrib]

-                                guid = guid.lower()

-                                toolName = split[3]

-                                path = '_'.join(split[0:4]) + '_PATH'

-                                path = self.ToolDef.ToolsDefTxtDictionary[path]

-                                path = self.GetRealPathOfTool(path)

-                                guidAttribs.append((guid, toolName, path))

-

+                        GuidBuildTarget, GuidToolChain, GuidArch, GuidTool, GuidAttr = attrib.split('_')

+                        if GuidAttr.upper() == 'GUID':

+                            if GuidBuildTarget == TAB_STAR:

+                                GuidBuildTarget = BuildTarget

+                            if GuidToolChain == TAB_STAR:

+                                GuidToolChain = ToolChain

+                            if GuidArch == TAB_STAR:

+                                GuidArch = Arch

+                            if GuidBuildTarget == BuildTarget and GuidToolChain == ToolChain and GuidArch == Arch:

+                                path = '_'.join(attrib.split('_')[:-1]) + '_PATH'

+                                if path in self.ToolDef.ToolsDefTxtDictionary:

+                                    path = self.ToolDef.ToolsDefTxtDictionary[path]

+                                    path = self.GetRealPathOfTool(path)

+                                    guidAttribs.append((value.lower(), GuidTool, path))

+                    # Sort by GuidTool name

+                    sorted (guidAttribs, key=lambda x: x[1])

                     # Write out GuidedSecTools.txt

                     toolsFile = os.path.join(FvDir, 'GuidedSectionTools.txt')

                     toolsFile = open(toolsFile, 'wt')