Revision: 17579
http://sourceforge.net/p/edk2/code/17579
Author: lgao4
Date: 2015-06-08 09:44:01 +0000 (Mon, 08 Jun 2015)
Log Message:
-----------
BaseTools: Update GenFds to handle file type Ffs Rule
Ffs Rule can specify a file type instead of specific file name. GenFds
should search Binary sections of module INF file and output directory
of the module to find all matched file with the specific file type.
Current GenFds only considers the final output target file. This patch
applies the above rule to match output file with the specific file type.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <[email protected]>
Reviewed-by: Yingke Liu <[email protected]>
Modified Paths:
--------------
trunk/edk2/BaseTools/Source/Python/GenFds/Section.py
Modified: trunk/edk2/BaseTools/Source/Python/GenFds/Section.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/GenFds/Section.py 2015-06-08
09:36:20 UTC (rev 17578)
+++ trunk/edk2/BaseTools/Source/Python/GenFds/Section.py 2015-06-08
09:44:01 UTC (rev 17579)
@@ -141,10 +141,27 @@
else:
GenFdsGlobalVariable.InfLogger ("\nCurrent ARCH \'%s\' of
File %s is not in the Support Arch Scope of %s specified by INF %s in FDF"
%(FfsInf.CurrentArch, File.File, File.Arch, FfsInf.InfFileName))
- if Suffix != None:
- SuffixMap = FfsInf.GetFinalTargetSuffixMap()
- if Suffix in SuffixMap:
- FileList.extend(SuffixMap[Suffix])
+ if Suffix != None and os.path.exists(FfsInf.EfiOutputPath):
+ #
+ # Get Makefile path and time stamp
+ #
+ MakefileDir = FfsInf.EfiOutputPath[:-len('OUTPUT')]
+ Makefile = os.path.join(MakefileDir, 'Makefile')
+ if not os.path.exists(Makefile):
+ Makefile = os.path.join(MakefileDir, 'GNUmakefile')
+ if not os.path.exists(Makefile):
+ SuffixMap = FfsInf.GetFinalTargetSuffixMap()
+ if Suffix in SuffixMap:
+ FileList.extend(SuffixMap[Suffix])
+ else:
+ # Update to search files with suffix in all sub-dirs.
+ Tuple = os.walk(FfsInf.EfiOutputPath)
+ for Dirpath, Dirnames, Filenames in Tuple:
+ for F in Filenames:
+ if os.path.splitext(F)[1] in (Suffix):
+ FullName = os.path.join(Dirpath, F)
+ if os.path.getmtime(FullName) >
os.path.getmtime(Makefile):
+ FileList.append(FullName)
#Process the file lists is alphabetical for a same section type
if len (FileList) > 1:
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
