BaseTools:Add [packages] section in dsc file

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2270

Currently a PCD (e.g. FeaturePCD) cannot be used in a conditional
statement in a DSC/FDF file without a module in the build referencing
the PCD package DEC file.

An example implementation that to support this is to allow a [Packages]
section in the DSC file to list additional package dependencies for PCD
references in the package DSC/FDF files.

this patch is going to  add the ability to have the [packages] section
defined in the DSC file

Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Acked-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

3 files changed, 25 insertions, 6 deletions

diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
index f0812b6887..e6d6c43810 100755
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
@@ -462,14 +462,31 @@ class ModuleAutoGen(AutoGen):
     def BuildCommand(self):

         return self.PlatformInfo.BuildCommand

 

-    ## Get object list of all packages the module and its dependent libraries belong to

+    ## Get Module package and Platform package

+    #

+    #   @retval list The list of package object

+    #

+    @cached_property

+    def PackageList(self):

+        PkagList = []

+        if self.Module.Packages:

+            PkagList.extend(self.Module.Packages)

+        Platform = self.BuildDatabase[self.PlatformInfo.MetaFile, self.Arch, self.BuildTarget, self.ToolChain]

+        for Package in Platform.Packages:

+            if Package in PkagList:

+                continue

+            PkagList.append(Package)

+        return PkagList

+

+    ## Get object list of all packages the module and its dependent libraries belong to and the Platform depends on

     #

     #   @retval     list    The list of package object

     #

     @cached_property

     def DerivedPackageList(self):

         PackageList = []

-        for M in [self.Module] + self.DependentLibraryList:

+        PackageList.extend(self.PackageList)

+        for M in self.DependentLibraryList:

             for Package in M.Packages:

                 if Package in PackageList:

                     continue

@@ -938,13 +955,13 @@ class ModuleAutoGen(AutoGen):
         self.Targets

         return self._FileTypes

 

-    ## Get the list of package object the module depends on

+    ## Get the list of package object the module depends on and the Platform depends on

     #

     #   @retval     list    The package object list

     #

     @cached_property

     def DependentPackageList(self):

-        return self.Module.Packages

+        return self.PackageList

 

     ## Return the list of auto-generated code file

     #

@@ -1101,7 +1118,7 @@ class ModuleAutoGen(AutoGen):
         RetVal.append(self.MetaFile.Dir)

         RetVal.append(self.DebugDir)

 

-        for Package in self.Module.Packages:

+        for Package in self.PackageList:

             PackageDir = mws.join(self.WorkspaceDir, Package.MetaFile.Dir)

             if PackageDir not in RetVal:

                 RetVal.append(PackageDir)

@@ -1125,7 +1142,7 @@ class ModuleAutoGen(AutoGen):
     @cached_property

     def PackageIncludePathList(self):

         IncludesList = []

-        for Package in self.Module.Packages:

+        for Package in self.PackageList:

             PackageDir = mws.join(self.WorkspaceDir, Package.MetaFile.Dir)

             IncludesList = Package.Includes

             if Package._PrivateIncludes:

diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
index debeb46f58..4c3cdf82d5 100644
--- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
@@ -975,6 +975,7 @@ class PlatformAutoGen(AutoGen):
                 continue

             ModuleData = self.BuildDatabase[ModuleFile, self.Arch, self.BuildTarget, self.ToolChain]

             RetVal.update(ModuleData.Packages)

+        RetVal.update(self.Platform.Packages)

         return list(RetVal)

 

     @cached_property

diff --git a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
index 9d8040905e..fde48b4b27 100644
--- a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
@@ -420,6 +420,7 @@ class WorkspaceAutoGen(AutoGen):
                     continue

                 ModuleData = self.BuildDatabase[ModuleFile, Arch, self.BuildTarget, self.ToolChain]

                 PkgSet.update(ModuleData.Packages)

+            PkgSet.update(Platform.Packages)

             Pkgs[Arch] = list(PkgSet)

         return Pkgs