edk2-buildtools-commits Mailing List for EDK II Build Tools (Page 15)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2329
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2329&view=rev
Author:   jsu1
Date:     2011-09-26 02:10:43 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Add support for including the path specified in [BuildOptions] during dependency generation for makefile

Signed-off-by: jsu1
Reviewed-by: djboyer
Reviewed-by: lgao4
Reviewed-by: lhauch

Modified Paths:
--------------
    branches/Releases/BaseTools_r2100/Source/Python/AutoGen/AutoGen.py
    branches/Releases/BaseTools_r2100/Source/Python/AutoGen/GenMake.py

Modified: branches/Releases/BaseTools_r2100/Source/Python/AutoGen/AutoGen.py
===================================================================

--- branches/Releases/BaseTools_r2100/Source/Python/AutoGen/AutoGen.py	2011-09-26 01:54:33 UTC (rev 2328)
+++ branches/Releases/BaseTools_r2100/Source/Python/AutoGen/AutoGen.py	2011-09-26 02:10:43 UTC (rev 2329)
@@ -155,7 +155,7 @@
 class WorkspaceAutoGen(AutoGen):
     ## Real constructor of WorkspaceAutoGen
     #
-    # This method behaves the same as __init__ except that it needs explict invoke
+    # This method behaves the same as __init__ except that it needs explicit invoke
     # (in super class's __new__ method)
     #
     #   @param  WorkspaceDir            Root directory of workspace
@@ -1749,6 +1749,7 @@
         self._DepexList               = None
         self._DepexExpressionList     = None
         self._BuildOption             = None
+        self._BuildOptionIncPathList  = None
         self._BuildTargets            = None
         self._IntroBuildTargetList    = None
         self._FinalBuildTargetList    = None
@@ -2004,6 +2005,50 @@
             self._BuildOption = self.PlatformInfo.ApplyBuildOption(self.Module)
         return self._BuildOption
 
+    ## Get include path list from tool option for the module build
+    #
+    #   @retval     list            The include path list
+    #
+    def _GetBuildOptionIncPathList(self):
+        if self._BuildOptionIncPathList == None:
+            #
+            # Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC
+            # is the former use /I , the Latter used -I to specify include directories
+            #
+            if self.PlatformInfo.ToolChainFamily in ('MSFT'):
+                gBuildOptIncludePattern = re.compile(r"(?:.*?)/I[ \t]*([^ ]*)", re.MULTILINE|re.DOTALL)
+            elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC'):
+                gBuildOptIncludePattern = re.compile(r"(?:.*?)-I[ \t]*([^ ]*)", re.MULTILINE|re.DOTALL)
+            
+            BuildOptionIncPathList = []
+            for Tool in ('CC', 'PP', 'VFRPP', 'ASLPP', 'ASLCC', 'APP', 'ASM'):
+                Attr = 'FLAGS'
+                try:
+                    FlagOption = self.BuildOption[Tool][Attr]
+                except KeyError:
+                    FlagOption = ''
+                
+                IncPathList = [NormPath(Path, self.Macros) for Path in gBuildOptIncludePattern.findall(FlagOption)]
+                #
+                # EDK II modules must not reference header files outside of the packages they depend on or 
+                # within the module's directory tree. Report error if violation.
+                #
+                if self.AutoGenVersion >= 0x00010005 and len(IncPathList) > 0:
+                    for Path in IncPathList:
+                        if (Path not in self.IncludePathList) and (CommonPath([Path, self.MetaFile.Dir]) != self.MetaFile.Dir):
+                            ErrMsg = "The include directory for the EDK II module in this line is invalid %s specified in %s FLAGS '%s'" % (Path, Tool, FlagOption) 
+                            EdkLogger.error("build", 
+                                            PARAMETER_INVALID,
+                                            ExtraData = ErrMsg, 
+                                            File = str(self.MetaFile))
+
+                
+                BuildOptionIncPathList += IncPathList
+            
+            self._BuildOptionIncPathList = BuildOptionIncPathList
+        
+        return self._BuildOptionIncPathList
+        
     ## Return a list of files which can be built from source
     #
     #  What kind of files can be built is determined by build rules in
@@ -2584,6 +2629,7 @@
     DxsFile                 = property(_GetDxsFile)
     DepexExpressionList     = property(_GetDepexExpressionTokenList)
     BuildOption             = property(_GetModuleBuildOption)
+    BuildOptionIncPathList  = property(_GetBuildOptionIncPathList)
     BuildCommand            = property(_GetBuildCommand)
 
 # This acts like the main() function for the script, unless it is 'import'ed into another script.

Modified: branches/Releases/BaseTools_r2100/Source/Python/AutoGen/GenMake.py
===================================================================
--- branches/Releases/BaseTools_r2100/Source/Python/AutoGen/GenMake.py	2011-09-26 01:54:33 UTC (rev 2328)
+++ branches/Releases/BaseTools_r2100/Source/Python/AutoGen/GenMake.py	2011-09-26 02:10:43 UTC (rev 2329)
@@ -614,7 +614,7 @@
         self.FileDependency = self.GetFileDependency(
                                     SourceFileList,
                                     ForceIncludedFile,
-                                    self._AutoGenObject.IncludePathList
+                                    self._AutoGenObject.IncludePathList + self._AutoGenObject.BuildOptionIncPathList
                                     )
         DepSet = None
         for File in self.FileDependency:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2010	Jan (18)	Feb (75)	Mar (40)	Apr (18)	May (12)	Jun (13)	Jul (17)	Aug (25)	Sep (31)	Oct (16)	Nov (20)	Dec (13)
2011	Jan (5)	Feb (7)	Mar (6)	Apr (21)	May (12)	Jun (35)	Jul (29)	Aug (56)	Sep (64)	Oct (43)	Nov (60)	Dec (26)
2012	Jan (6)	Feb (12)	Mar (17)	Apr (10)	May (11)	Jun (13)	Jul (6)	Aug (2)	Sep (3)	Oct (9)	Nov (1)	Dec (2)
2013	Jan (5)	Feb (5)	Mar (1)	Apr (3)	May (3)	Jun (3)	Jul (8)	Aug (7)	Sep (2)	Oct (4)	Nov (14)	Dec (10)
2014	Jan (22)	Feb (7)	Mar (3)	Apr (4)	May (1)	Jun (6)	Jul (4)	Aug	Sep	Oct (1)	Nov	Dec

edk2-buildtools-commits Mailing List for EDK II Build Tools (Page 15)

edk2-buildtools-commits — EDK II Build Tools Source changes