diff options
| author | Liming Gao <liming.gao@intel.com> | 2013-09-24 07:13:44 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-09-24 07:13:44 +0000 |
| commit | ea0f6464330a08f274fb886c3326ca5777ded2c5 (patch) | |
| tree | a0a2d34a3830ba3fd245dcffa8abf60c1891462a /BaseTools/Source/Python | |
| parent | ac0908afc202efdfe0df0eafe041b2720a315e61 (diff) | |
| download | edk2-ea0f6464330a08f274fb886c3326ca5777ded2c5.tar.gz edk2-ea0f6464330a08f274fb886c3326ca5777ded2c5.tar.bz2 edk2-ea0f6464330a08f274fb886c3326ca5777ded2c5.zip | |
Sync BaseTool trunk (version r2601) into EDKII BaseTools.
Signed-off-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14710 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools/Source/Python')
| -rw-r--r-- | BaseTools/Source/Python/Common/BuildVersion.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/UPT/BuildVersion.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Workspace/MetaFileParser.py | 14 |
3 files changed, 15 insertions, 3 deletions
diff --git a/BaseTools/Source/Python/Common/BuildVersion.py b/BaseTools/Source/Python/Common/BuildVersion.py index 7414d30f49..25546cdfe9 100644 --- a/BaseTools/Source/Python/Common/BuildVersion.py +++ b/BaseTools/Source/Python/Common/BuildVersion.py @@ -13,4 +13,4 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-gBUILD_VERSION = ""
+gBUILD_VERSION = "Build 2601"
diff --git a/BaseTools/Source/Python/UPT/BuildVersion.py b/BaseTools/Source/Python/UPT/BuildVersion.py index edd4696753..fa6c26aa76 100644 --- a/BaseTools/Source/Python/UPT/BuildVersion.py +++ b/BaseTools/Source/Python/UPT/BuildVersion.py @@ -17,4 +17,4 @@ Build version information
'''
-gBUILD_VERSION = ""
+gBUILD_VERSION = "Build 2601"
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py index b2e98633af..34000b5e88 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -827,6 +827,7 @@ class DscParser(MetaFileParser): except: EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile) + OwnerId = {} for Index in range(0, len(Content)): Line = CleanString(Content[Index]) # skip empty line @@ -847,6 +848,7 @@ class DscParser(MetaFileParser): self._SubsectionType = MODEL_UNKNOWN self._SubsectionName = '' self._Owner[-1] = -1 + OwnerId = {} continue # subsection header elif Line[0] == TAB_OPTION_START and Line[-1] == TAB_OPTION_END: @@ -871,6 +873,9 @@ class DscParser(MetaFileParser): # LineBegin=-1, ColumnBegin=-1, LineEnd=-1, ColumnEnd=-1, Enabled=-1 # for Arch, ModuleType in self._Scope: + Owner = self._Owner[-1] + if self._SubsectionType != MODEL_UNKNOWN: + Owner = OwnerId[Arch] self._LastItem = self._Store( self._ItemType, self._ValueList[0], @@ -878,7 +883,7 @@ class DscParser(MetaFileParser): self._ValueList[2], Arch, ModuleType, - self._Owner[-1], + Owner, self._From, self._LineIndex + 1, - 1, @@ -886,6 +891,8 @@ class DscParser(MetaFileParser): - 1, self._Enabled ) + if self._SubsectionType == MODEL_UNKNOWN and self._InSubsection: + OwnerId[Arch] = self._LastItem if self._DirectiveStack: Type, Line, Text = self._DirectiveStack[-1] @@ -1040,6 +1047,11 @@ class DscParser(MetaFileParser): ExtraData=self._CurrentLine + " (<TokenSpaceGuidCName>.<TokenCName>|<PcdValue>)", File=self.MetaFile, Line=self._LineIndex + 1) if self._ValueList[2] == '': + # + # The PCD values are optional for FIXEDATBUILD and PATCHABLEINMODULE + # + if self._SectionType in (MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE): + return EdkLogger.error('Parser', FORMAT_INVALID, "No PCD value given", ExtraData=self._CurrentLine + " (<TokenSpaceGuidCName>.<TokenCName>|<PcdValue>)", File=self.MetaFile, Line=self._LineIndex + 1) |