* [Patch] BaseTools: handling the case that map file is not exist
@ 2016-09-22 13:56 Yonghong Zhu
2016-09-23 1:36 ` Gao, Liming
0 siblings, 1 reply; 2+ messages in thread
From: Yonghong Zhu @ 2016-09-22 13:56 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao
We meet a case that add the library inf file which has the uni file in
the [Sources] section, for this case there will no map file exist, it
cause build tools report Traceback error.
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
BaseTools/Source/Python/GenFds/FfsInfStatement.py | 33 ++++++++++++-----------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index b0b22d1..e9517a4 100644
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -939,26 +939,27 @@ class FfsInfStatement(FfsInfStatementClassObject):
if len(VfrUniBaseName) > 0:
VfrUniOffsetList = self.__GetBuildOutputMapFileVfrUniInfo(VfrUniBaseName)
#
# Generate the Raw data of raw section
#
- os.path.join( self.OutputPath, self.BaseName + '.offset')
- UniVfrOffsetFileName = os.path.join( self.OutputPath, self.BaseName + '.offset')
- UniVfrOffsetFileSection = os.path.join( self.OutputPath, self.BaseName + 'Offset' + '.raw')
-
- self.__GenUniVfrOffsetFile (VfrUniOffsetList, UniVfrOffsetFileName)
-
- UniVfrOffsetFileNameList = []
- UniVfrOffsetFileNameList.append(UniVfrOffsetFileName)
- """Call GenSection"""
- GenFdsGlobalVariable.GenerateSection(UniVfrOffsetFileSection,
- UniVfrOffsetFileNameList,
- "EFI_SECTION_RAW"
- )
- os.remove(UniVfrOffsetFileName)
- SectList.append(UniVfrOffsetFileSection)
- HasGneratedFlag = True
+ if VfrUniOffsetList:
+ os.path.join( self.OutputPath, self.BaseName + '.offset')
+ UniVfrOffsetFileName = os.path.join( self.OutputPath, self.BaseName + '.offset')
+ UniVfrOffsetFileSection = os.path.join( self.OutputPath, self.BaseName + 'Offset' + '.raw')
+
+ self.__GenUniVfrOffsetFile (VfrUniOffsetList, UniVfrOffsetFileName)
+
+ UniVfrOffsetFileNameList = []
+ UniVfrOffsetFileNameList.append(UniVfrOffsetFileName)
+ """Call GenSection"""
+ GenFdsGlobalVariable.GenerateSection(UniVfrOffsetFileSection,
+ UniVfrOffsetFileNameList,
+ "EFI_SECTION_RAW"
+ )
+ os.remove(UniVfrOffsetFileName)
+ SectList.append(UniVfrOffsetFileSection)
+ HasGneratedFlag = True
for SecName in SectList :
SectFiles.append(SecName)
SectAlignments.append(Align)
Index = Index + 1
--
2.6.1.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch] BaseTools: handling the case that map file is not exist
2016-09-22 13:56 [Patch] BaseTools: handling the case that map file is not exist Yonghong Zhu
@ 2016-09-23 1:36 ` Gao, Liming
0 siblings, 0 replies; 2+ messages in thread
From: Gao, Liming @ 2016-09-23 1:36 UTC (permalink / raw)
To: Zhu, Yonghong, edk2-devel@lists.01.org
Reviewed-by: Liming Gao <liming.gao@intel.com>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Yonghong Zhu
> Sent: Thursday, September 22, 2016 9:57 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [Patch] BaseTools: handling the case that map file is not exist
>
> We meet a case that add the library inf file which has the uni file in
> the [Sources] section, for this case there will no map file exist, it
> cause build tools report Traceback error.
>
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
> BaseTools/Source/Python/GenFds/FfsInfStatement.py | 33
> ++++++++++++-----------
> 1 file changed, 17 insertions(+), 16 deletions(-)
>
> diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
> b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
> index b0b22d1..e9517a4 100644
> --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
> +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
> @@ -939,26 +939,27 @@ class FfsInfStatement(FfsInfStatementClassObject):
> if len(VfrUniBaseName) > 0:
> VfrUniOffsetList =
> self.__GetBuildOutputMapFileVfrUniInfo(VfrUniBaseName)
> #
> # Generate the Raw data of raw section
> #
> - os.path.join( self.OutputPath, self.BaseName + '.offset')
> - UniVfrOffsetFileName = os.path.join( self.OutputPath,
> self.BaseName + '.offset')
> - UniVfrOffsetFileSection = os.path.join( self.OutputPath,
> self.BaseName + 'Offset' + '.raw')
> -
> - self.__GenUniVfrOffsetFile (VfrUniOffsetList,
> UniVfrOffsetFileName)
> -
> - UniVfrOffsetFileNameList = []
> - UniVfrOffsetFileNameList.append(UniVfrOffsetFileName)
> - """Call GenSection"""
> - GenFdsGlobalVariable.GenerateSection(UniVfrOffsetFileSection,
> - UniVfrOffsetFileNameList,
> - "EFI_SECTION_RAW"
> - )
> - os.remove(UniVfrOffsetFileName)
> - SectList.append(UniVfrOffsetFileSection)
> - HasGneratedFlag = True
> + if VfrUniOffsetList:
> + os.path.join( self.OutputPath, self.BaseName + '.offset')
> + UniVfrOffsetFileName = os.path.join( self.OutputPath,
> self.BaseName + '.offset')
> + UniVfrOffsetFileSection = os.path.join( self.OutputPath,
> self.BaseName + 'Offset' + '.raw')
> +
> + self.__GenUniVfrOffsetFile (VfrUniOffsetList,
> UniVfrOffsetFileName)
> +
> + UniVfrOffsetFileNameList = []
> + UniVfrOffsetFileNameList.append(UniVfrOffsetFileName)
> + """Call GenSection"""
> +
> GenFdsGlobalVariable.GenerateSection(UniVfrOffsetFileSection,
> + UniVfrOffsetFileNameList,
> + "EFI_SECTION_RAW"
> + )
> + os.remove(UniVfrOffsetFileName)
> + SectList.append(UniVfrOffsetFileSection)
> + HasGneratedFlag = True
>
> for SecName in SectList :
> SectFiles.append(SecName)
> SectAlignments.append(Align)
> Index = Index + 1
> --
> 2.6.1.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-23 1:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-22 13:56 [Patch] BaseTools: handling the case that map file is not exist Yonghong Zhu
2016-09-23 1:36 ` Gao, Liming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox