Sync BaseTools Branch (version r2321) to EDKII main trunk.

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


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

2 files changed, 50 insertions, 17 deletions

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 7f34f49c95..fabc7ed986 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -338,10 +338,10 @@ class InfParser(MetaFileParser):
                 NextLine = CleanString(self._Content[Index + 1])
             if Line == '':
                 continue
-            if Line.find(DataType.TAB_COMMENT_R8_START) > -1:
+            if Line.find(DataType.TAB_COMMENT_EDK_START) > -1:
                 IsFindBlockComment = True
                 continue
-            if Line.find(DataType.TAB_COMMENT_R8_END) > -1:
+            if Line.find(DataType.TAB_COMMENT_EDK_END) > -1:
                 IsFindBlockComment = False
                 continue
             if IsFindBlockComment:
@@ -479,7 +479,7 @@ class InfParser(MetaFileParser):
                             ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1)
         self._Macros[TokenList[0]] = ReplaceMacro(TokenList[1], self._Macros, False)
         
-    ## [nmake] section parser (R8.x style only)
+    ## [nmake] section parser (EDK.x style only)
     def _NmakeParser(self):
         TokenList = GetSplitValueList(self._CurrentLine, TAB_EQUAL_SPLIT, 1)
         self._ValueList[0:len(TokenList)] = TokenList
@@ -519,11 +519,11 @@ class InfParser(MetaFileParser):
         MODEL_UNKNOWN                   :   MetaFileParser._Skip,
         MODEL_META_DATA_HEADER          :   _DefineParser,
         MODEL_META_DATA_BUILD_OPTION    :   MetaFileParser._BuildOptionParser,
-        MODEL_EFI_INCLUDE               :   _IncludeParser,                 # for R8.x modules
-        MODEL_EFI_LIBRARY_INSTANCE      :   MetaFileParser._CommonParser,   # for R8.x modules
+        MODEL_EFI_INCLUDE               :   _IncludeParser,                 # for EDK.x modules
+        MODEL_EFI_LIBRARY_INSTANCE      :   MetaFileParser._CommonParser,   # for EDK.x modules
         MODEL_EFI_LIBRARY_CLASS         :   MetaFileParser._PathParser,
         MODEL_META_DATA_PACKAGE         :   MetaFileParser._PathParser,
-        MODEL_META_DATA_NMAKE           :   _NmakeParser,                   # for R8.x modules
+        MODEL_META_DATA_NMAKE           :   _NmakeParser,                   # for EDK.x modules
         MODEL_PCD_FIXED_AT_BUILD        :   _PcdParser,
         MODEL_PCD_PATCHABLE_IN_MODULE   :   _PcdParser,
         MODEL_PCD_FEATURE_FLAG          :   _PcdParser,
@@ -894,11 +894,21 @@ class DscParser(MetaFileParser):
             return self._OP_[Op](Value)
         # three operands
         elif TokenNumber == 3:
-            TokenValue = self._EvaluateToken(TokenList[0], Expression)
+            TokenValue = TokenList[0] 
+            if TokenValue[0] in ["'", '"'] and TokenValue[-1] in ["'", '"']:
+                TokenValue = TokenValue[1:-1]             
+            if TokenValue.startswith("$(") and TokenValue.endswith(")"):
+                TokenValue = self._EvaluateToken(TokenValue, Expression)
+            if TokenValue[0] in ["'", '"'] and TokenValue[-1] in ["'", '"']:
+                TokenValue = TokenValue[1:-1]                
             if TokenValue == None:
                 return False
             Value = TokenList[2]
             if Value[0] in ["'", '"'] and Value[-1] in ["'", '"']:
+                Value = Value[1:-1]            
+            if Value.startswith("$(") and Value.endswith(")"):
+                Value = self._EvaluateToken(Value, Expression)          
+            if Value[0] in ["'", '"'] and Value[-1] in ["'", '"']:
                 Value = Value[1:-1]
             Op = TokenList[1]
             if Op not in self._OP_:
diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
index f923129c54..4bfa7d8ffd 100644
--- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
@@ -300,7 +300,7 @@ class DscBuildData(PlatformBuildClassObject):
             if self._Header == None:

                 self._GetHeaderInfo()

             if self._BuildTargets == None:

-                self._BuildTargets = ['DEBUG', 'RELEASE']

+                self._BuildTargets = ['DEBUG', 'RELEASE', 'NOOPT']

         return self._BuildTargets

 

     ## Retrieve SKUID_IDENTIFIER

@@ -564,7 +564,7 @@ class DscBuildData(PlatformBuildClassObject):
                         continue

                     self._LibraryClasses[LibraryClass, ModuleType] = LibraryInstance

 

-            # for R8 style library instances, which are listed in different section

+            # for EDK style library instances, which are listed in different section

             RecordList = self._RawData[MODEL_EFI_LIBRARY_INSTANCE, self._Arch]

             for Record in RecordList:

                 File = PathClass(NormPath(Record[0], Macros), GlobalData.gWorkspace, Arch=self._Arch)

@@ -1198,6 +1198,7 @@ class InfBuildData(ModuleBuildClassObject):
         TAB_INF_DEFINES_COMPONENT_TYPE              : "_ComponentType",

         TAB_INF_DEFINES_MAKEFILE_NAME               : "_MakefileName",

         #TAB_INF_DEFINES_CUSTOM_MAKEFILE             : "_CustomMakefile",

+        TAB_INF_DEFINES_DPX_SOURCE                  :"_DxsFile",

         TAB_INF_DEFINES_VERSION_NUMBER              : "_Version",

         TAB_INF_DEFINES_VERSION_STRING              : "_Version",

         TAB_INF_DEFINES_VERSION                     : "_Version",

@@ -1278,6 +1279,7 @@ class InfBuildData(ModuleBuildClassObject):
         self._Header_               = None

         self._AutoGenVersion        = None

         self._BaseName              = None

+        self._DxsFile               = None

         self._ModuleType            = None

         self._ComponentType         = None

         self._BuildType             = None

@@ -1419,7 +1421,7 @@ class InfBuildData(ModuleBuildClassObject):
                 self._Defs[Name] = Record[1]

 

         #

-        # Retrieve information in sections specific to R8.x modules

+        # Retrieve information in sections specific to EDK.x modules

         #

         if self._AutoGenVersion >= 0x00010005:   # _AutoGenVersion may be None, which is less than anything

             if not self._ModuleType:

@@ -1446,6 +1448,17 @@ class InfBuildData(ModuleBuildClassObject):
                 self._BuildType = 'UEFI_HII'

             else:

                 self._BuildType = self._ModuleType.upper()

+            

+            if self._DxsFile:

+                File = PathClass(NormPath(self._DxsFile), self._ModuleDir, Arch=self._Arch)

+                # check the file validation

+                ErrorCode, ErrorInfo = File.Validate(".dxs", CaseSensitive=False)

+                if ErrorCode != 0:

+                    EdkLogger.error('build', ErrorCode, ExtraData=ErrorInfo,

+                                    File=self.MetaFile, Line=LineNo)

+                if self.Sources == None:

+                    self._Sources = []

+                self._Sources.append(File)

         else:

             self._BuildType = self._ComponentType.upper()

             if not self._ComponentType:

@@ -1492,7 +1505,7 @@ class InfBuildData(ModuleBuildClassObject):
                         else:

                             Tool = ToolList[0]

                         ToolChain = "*_*_*_%s_FLAGS" % Tool

-                        ToolChainFamily = 'MSFT'    # R8.x only support MSFT tool chain

+                        ToolChainFamily = 'MSFT'    # EDK.x only support MSFT tool chain

                         #ignore not replaced macros in value

                         ValueList = GetSplitValueList(' ' + Value, '/D')

                         Dummy = ValueList[0]

@@ -1527,6 +1540,15 @@ class InfBuildData(ModuleBuildClassObject):
                 EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No BASE_NAME name", File=self.MetaFile)

         return self._BaseName

 

+    ## Retrieve DxsFile

+    def _GetDxsFile(self):

+        if self._DxsFile == None:

+            if self._Header_ == None:

+                self._GetHeaderInfo()

+            if self._DxsFile == None:

+                self._DxsFile = ''

+        return self._DxsFile

+

     ## Retrieve MODULE_TYPE

     def _GetModuleType(self):

         if self._ModuleType == None:

@@ -1709,7 +1731,7 @@ class InfBuildData(ModuleBuildClassObject):
                 ToolCode = Record[3]

                 FeatureFlag = Record[4]

                 if self._AutoGenVersion < 0x00010005:

-                    # old module source files (R8)

+                    # old module source files (EDK)

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

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

                     # check the file validation

@@ -1746,13 +1768,13 @@ class InfBuildData(ModuleBuildClassObject):
                 self._LibraryClasses[Lib] = Instance

         return self._LibraryClasses

 

-    ## Retrieve library names (for R8.x style of modules)

+    ## Retrieve library names (for EDK.x style of modules)

     def _GetLibraryNames(self):

         if self._Libraries == None:

             self._Libraries = []

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

             for Record in RecordList:

-                # in case of name with '.lib' extension, which is unusual in R8.x inf

+                # in case of name with '.lib' extension, which is unusual in EDK.x inf

                 Record = ReplaceMacros(Record, GlobalData.gEdkGlobal, False)

                 LibraryName = os.path.splitext(Record[0])[0]

                 if LibraryName not in self._Libraries:

@@ -1807,14 +1829,14 @@ class InfBuildData(ModuleBuildClassObject):
                 self._Guids[CName] = Value

         return self._Guids

 

-    ## Retrieve include paths necessary for this module (for R8.x style of modules)

+    ## Retrieve include paths necessary for this module (for EDK.x style of modules)

     def _GetIncludes(self):

         if self._Includes == None:

             self._Includes = []

             if self._SourceOverridePath:

                 self._Includes.append(self._SourceOverridePath)

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

-            # [includes] section must be used only in old (R8.x) inf file

+            # [includes] section must be used only in old (EDK.x) inf file

             if self.AutoGenVersion >= 0x00010005 and len(RecordList) > 0:

                 EdkLogger.error('build', FORMAT_NOT_SUPPORTED, "No [include] section allowed",

                                 File=self.MetaFile, Line=RecordList[0][-1]-1)

@@ -2130,7 +2152,8 @@ class InfBuildData(ModuleBuildClassObject):
     ConstructorList         = property(_GetConstructor)

     DestructorList          = property(_GetDestructor)

     Defines                 = property(_GetDefines)

-

+    DxsFile                 = property(_GetDxsFile)

+    

     Binaries                = property(_GetBinaryFiles)

     Sources                 = property(_GetSourceFiles)

     LibraryClasses          = property(_GetLibraryClassUses)