Revision: 16149
http://sourceforge.net/p/edk2/code/16149
Author: hchen30
Date: 2014-09-19 02:04:08 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
BaseTools/Upt: Fix several bugs
1. Fix a bug of packaging a full path file in zip at Linux.
2. Fix a format error of generating Hob/Event/BootMode information.
3. Fix a bug of generating additional ?\226?\128?\156GUID?\226?\128?\157
subtype for ?\226?\128?\156UNDEFINED?\226?\128?\157 guid.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <[email protected]>
Reviewed-by: Yingke Liu <[email protected]>
Modified Paths:
--------------
trunk/edk2/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
trunk/edk2/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
trunk/edk2/BaseTools/Source/Python/UPT/Library/Parsing.py
Modified:
trunk/edk2/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
2014-09-19 01:39:45 UTC (rev 16148)
+++ trunk/edk2/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
2014-09-19 02:04:08 UTC (rev 16149)
@@ -212,7 +212,7 @@
#
for MiscFileObj in Package.GetMiscFileList():
for FileObj in MiscFileObj.GetFileList():
- MiscFileFullPath =
os.path.normpath(os.path.join(os.path.dirname(FullPath), FileObj.GetURI()))
+ MiscFileFullPath =
os.path.normpath(os.path.join(PackagePath, FileObj.GetURI()))
if MiscFileFullPath not in self.FileList:
self.FileList.append(MiscFileFullPath)
Modified: trunk/edk2/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
2014-09-19 01:39:45 UTC (rev 16148)
+++ trunk/edk2/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
2014-09-19 02:04:08 UTC (rev 16149)
@@ -705,7 +705,7 @@
else:
Comment = ''
if Usage != DT.ITEM_UNDEFINED and GuidType == DT.ITEM_UNDEFINED:
- Comment = '## ' + Usage + ' ## GUID ' + Comment
+ Comment = '## ' + Usage + Comment
elif GuidType == 'Variable':
Comment = '## ' + Usage + ' ## ' + GuidType + ':' +
VariableName + Comment
else:
@@ -1027,10 +1027,10 @@
Content = '# ' + ('\n' + '# ').join(GetSplitValueList(SectionContent,
'\n'))
Content = Content.lstrip()
#
- # add two empty line after the generated section content to differentiate
it between other possible sections
+ # add a return to differentiate it between other possible sections
#
if Content:
- Content += '\n#\n#\n'
+ Content += '\n'
return Content
## GenBuildOptions
#
Modified: trunk/edk2/BaseTools/Source/Python/UPT/Library/Parsing.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/UPT/Library/Parsing.py 2014-09-19
01:39:45 UTC (rev 16148)
+++ trunk/edk2/BaseTools/Source/Python/UPT/Library/Parsing.py 2014-09-19
02:04:08 UTC (rev 16149)
@@ -983,7 +983,7 @@
NewStatement = ""
for Line in LineList:
# ignore blank comment
- if not Line.replace("#", '').strip() and SectionName !=
'Defines':
+ if not Line.replace("#", '').strip() and SectionName not
in ('Defines', 'Hob', 'Event', 'BootMode'):
continue
# add two space before non-comments line except the
comments in Defines section
if Line.strip().startswith('#') and SectionName ==
'Defines':
------------------------------------------------------------------------------
Slashdot TV. Video for Nerds. Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
