Sync BaseTool trunk (version r2460) into EDKII BaseTools. The change mainly includes:

  1. Support use expression as DSC file PCD value.
  2. Update FDF parser to fix bug to get complete macro value.
  3. Fix bug to replace SET statement macro and evaluate SET statement PCD value in FDF file.
  4. Fix a bug for MACRO defined in conditional block cannot be processed correctly

Signed-off-by: lgao4
Reviewed-by: gikidy


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12827 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 5 insertions, 5 deletions

diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
index 71e98a94be..a8452a9f84 100644
--- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
@@ -429,7 +429,7 @@ class DscBuildData(PlatformBuildClassObject):
                                     File=self.MetaFile, Line=Record[-1])

                 self._SkuIds[Record[1]] = Record[0]

             if 'DEFAULT' not in self._SkuIds:

-                self._SkuIds['DEFAULT'] = 0

+                self._SkuIds['DEFAULT'] = '0'

         return self._SkuIds

 

     ## Retrieve [Components] section information

@@ -1343,10 +1343,10 @@ class InfBuildData(ModuleBuildClassObject):
     def _GetMacros(self):

         if self.__Macros == None:

             self.__Macros = {}

-            # EDK_GLOBAL defined macros can be applied to EDK modoule

+            # EDK_GLOBAL defined macros can be applied to EDK module

             if self.AutoGenVersion < 0x00010005:

                 self.__Macros.update(GlobalData.gEdkGlobal)

-            self.__Macros.update(GlobalData.gGlobalDefines)

+                self.__Macros.update(GlobalData.gGlobalDefines)

         return self.__Macros

 

     ## Get architecture

@@ -1760,8 +1760,6 @@ class InfBuildData(ModuleBuildClassObject):
             self._Sources = []

             RecordList = self._RawData[MODEL_EFI_SOURCE_FILE, self._Arch, self._Platform]

             Macros = self._Macros

-            Macros["EDK_SOURCE"] = GlobalData.gEcpSource

-            Macros['PROCESSOR'] = self._Arch

             for Record in RecordList:

                 LineNo = Record[-1]

                 ToolChainFamily = Record[1]

@@ -1769,6 +1767,8 @@ class InfBuildData(ModuleBuildClassObject):
                 ToolCode = Record[3]

                 FeatureFlag = Record[4]

                 if self.AutoGenVersion < 0x00010005:

+                    Macros["EDK_SOURCE"] = GlobalData.gEcpSource

+                    Macros['PROCESSOR'] = self._Arch

                     # old module source files (Edk)

                     File = PathClass(NormPath(Record[0], Macros), self._ModuleDir, self._SourceOverridePath,

                                      '', False, self._Arch, ToolChainFamily, '', TagName, ToolCode)