]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/AutoGen/GenMake.py
BaseTools: Fix an incremental build issue caused by macro in #include
[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenMake.py
old mode 100644 (file)
new mode 100755 (executable)
index ef7bc84..59a01a7
@@ -2,13 +2,7 @@
 # Create makefile for MS nmake and GNU make\r
 #\r
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.  The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 ## Import Modules\r
@@ -211,10 +205,12 @@ class BuildFile(object):
     def GetRemoveDirectoryCommand(self, DirList):\r
         return [self._RD_TEMPLATE_[self._FileType] % {'dir':Dir} for Dir in DirList]\r
 \r
-    def PlaceMacro(self, Path, MacroDefinitions={}):\r
+    def PlaceMacro(self, Path, MacroDefinitions=None):\r
         if Path.startswith("$("):\r
             return Path\r
         else:\r
+            if MacroDefinitions is None:\r
+                MacroDefinitions = {}\r
             PathLength = len(Path)\r
             for MacroName in MacroDefinitions:\r
                 MacroValue = MacroDefinitions[MacroName]\r
@@ -435,7 +431,7 @@ cleanlib:
         self.CommonFileDependency = []\r
         self.FileListMacros = {}\r
         self.ListFileMacros = {}\r
-\r
+        self.ObjTargetDict = OrderedDict()\r
         self.FileCache = {}\r
         self.LibraryBuildCommandList = []\r
         self.LibraryFileList = []\r
@@ -453,6 +449,7 @@ cleanlib:
         self.GenFfsList                 = ModuleAutoGen.GenFfsList\r
         self.MacroList = ['FFS_OUTPUT_DIR', 'MODULE_GUID', 'OUTPUT_DIR']\r
         self.FfsOutputFileList = []\r
+        self.DependencyHeaderFileSet = set()\r
 \r
     # Compose a dict object containing information used to do replacement in template\r
     @property\r
@@ -476,23 +473,16 @@ cleanlib:
         else:\r
             ModuleEntryPoint = "_ModuleEntryPoint"\r
 \r
-        # Intel EBC compiler enforces EfiMain\r
-        if MyAgo.AutoGenVersion < 0x00010005 and MyAgo.Arch == "EBC":\r
-            ArchEntryPoint = "EfiMain"\r
-        else:\r
-            ArchEntryPoint = ModuleEntryPoint\r
+        ArchEntryPoint = ModuleEntryPoint\r
 \r
         if MyAgo.Arch == "EBC":\r
             # EBC compiler always use "EfiStart" as entry point. Only applies to EdkII modules\r
             ImageEntryPoint = "EfiStart"\r
-        elif MyAgo.AutoGenVersion < 0x00010005:\r
-            # Edk modules use entry point specified in INF file\r
-            ImageEntryPoint = ModuleEntryPoint\r
         else:\r
             # EdkII modules always use "_ModuleEntryPoint" as entry point\r
             ImageEntryPoint = "_ModuleEntryPoint"\r
 \r
-        for k, v in MyAgo.Module.Defines.iteritems():\r
+        for k, v in MyAgo.Module.Defines.items():\r
             if k not in MyAgo.Macros:\r
                 MyAgo.Macros[k] = v\r
 \r
@@ -504,7 +494,7 @@ cleanlib:
             MyAgo.Macros['IMAGE_ENTRY_POINT'] = ImageEntryPoint\r
 \r
         PCI_COMPRESS_Flag = False\r
-        for k, v in MyAgo.Module.Defines.iteritems():\r
+        for k, v in MyAgo.Module.Defines.items():\r
             if 'PCI_COMPRESS' == k and 'TRUE' == v:\r
                 PCI_COMPRESS_Flag = True\r
 \r
@@ -525,6 +515,9 @@ cleanlib:
                     # Remove duplicated include path, if any\r
                     if Attr == "FLAGS":\r
                         Value = RemoveDupOption(Value, IncPrefix, MyAgo.IncludePathList)\r
+                        if self._AutoGenObject.BuildRuleFamily == TAB_COMPILER_MSFT and Tool == 'CC' and '/GM' in Value:\r
+                            Value = Value.replace(' /MP', '')\r
+                            MyAgo.BuildOption[Tool][Attr] = Value\r
                         if Tool == "OPTROM" and PCI_COMPRESS_Flag:\r
                             ValueList = Value.split()\r
                             if ValueList:\r
@@ -555,8 +548,8 @@ cleanlib:
                 NewRespStr = ' '.join(NewStr)\r
                 SaveFileOnChange(RespFile, NewRespStr, False)\r
                 ToolsDef.append("%s = %s" % (Resp, UnexpandMacroStr + ' @' + RespFile))\r
-                RespFileListContent += '@' + RespFile + os.linesep\r
-                RespFileListContent += NewRespStr + os.linesep\r
+                RespFileListContent += '@' + RespFile + TAB_LINE_BREAK\r
+                RespFileListContent += NewRespStr + TAB_LINE_BREAK\r
             SaveFileOnChange(RespFileList, RespFileListContent, False)\r
         else:\r
             if os.path.exists(RespFileList):\r
@@ -625,11 +618,11 @@ cleanlib:
                 False\r
                 )\r
 \r
-        # Edk modules need <BaseName>StrDefs.h for string ID\r
-        #if MyAgo.AutoGenVersion < 0x00010005 and len(MyAgo.UnicodeFileList) > 0:\r
-        #    BcTargetList = ['strdefs']\r
-        #else:\r
-        #    BcTargetList = []\r
+        # Generate objlist used to create .obj file\r
+        for Type in self.ObjTargetDict:\r
+            NewLine = ' '.join(list(self.ObjTargetDict[Type]))\r
+            FileMacroList.append("OBJLIST_%s = %s" % (list(self.ObjTargetDict.keys()).index(Type), NewLine))\r
+\r
         BcTargetList = []\r
 \r
         MakefileName = self._FILE_NAME_[self._FileType]\r
@@ -673,7 +666,7 @@ cleanlib:
             "module_relative_directory" : MyAgo.SourceDir,\r
             "module_dir"                : mws.join (self.Macros["WORKSPACE"], MyAgo.SourceDir),\r
             "package_relative_directory": package_rel_dir,\r
-            "module_extra_defines"      : ["%s = %s" % (k, v) for k, v in MyAgo.Module.Defines.iteritems()],\r
+            "module_extra_defines"      : ["%s = %s" % (k, v) for k, v in MyAgo.Module.Defines.items()],\r
 \r
             "architecture"              : MyAgo.Arch,\r
             "toolchain_tag"             : MyAgo.ToolChain,\r
@@ -687,8 +680,8 @@ cleanlib:
             "separator"                 : Separator,\r
             "module_tool_definitions"   : ToolsDef,\r
 \r
-            "shell_command_code"        : self._SHELL_CMD_[self._FileType].keys(),\r
-            "shell_command"             : self._SHELL_CMD_[self._FileType].values(),\r
+            "shell_command_code"        : list(self._SHELL_CMD_[self._FileType].keys()),\r
+            "shell_command"             : list(self._SHELL_CMD_[self._FileType].values()),\r
 \r
             "module_entry_point"        : ModuleEntryPoint,\r
             "image_entry_point"         : ImageEntryPoint,\r
@@ -728,7 +721,7 @@ cleanlib:
             for index, Str in enumerate(FfsCmdList):\r
                 if '-o' == Str:\r
                     OutputFile = FfsCmdList[index + 1]\r
-                if '-i' == Str:\r
+                if '-i' == Str or "-oi" == Str:\r
                     if DepsFileList == []:\r
                         DepsFileList = [FfsCmdList[index + 1]]\r
                     else:\r
@@ -915,6 +908,70 @@ cleanlib:
                                     ForceIncludedFile,\r
                                     self._AutoGenObject.IncludePathList + self._AutoGenObject.BuildOptionIncPathList\r
                                     )\r
+\r
+\r
+        if FileDependencyDict:\r
+            for Dependency in FileDependencyDict.values():\r
+                self.DependencyHeaderFileSet.update(set(Dependency))\r
+\r
+        # Get a set of unique package includes from MetaFile\r
+        parentMetaFileIncludes = set()\r
+        for aInclude in self._AutoGenObject.PackageIncludePathList:\r
+            aIncludeName = str(aInclude)\r
+            parentMetaFileIncludes.add(aIncludeName.lower())\r
+\r
+        # Check if header files are listed in metafile\r
+        # Get a set of unique module header source files from MetaFile\r
+        headerFilesInMetaFileSet = set()\r
+        for aFile in self._AutoGenObject.SourceFileList:\r
+            aFileName = str(aFile)\r
+            if not aFileName.endswith('.h'):\r
+                continue\r
+            headerFilesInMetaFileSet.add(aFileName.lower())\r
+\r
+        # Get a set of unique module autogen files\r
+        localAutoGenFileSet = set()\r
+        for aFile in self._AutoGenObject.AutoGenFileList:\r
+            localAutoGenFileSet.add(str(aFile).lower())\r
+\r
+        # Get a set of unique module dependency header files\r
+        # Exclude autogen files and files not in the source directory\r
+        # and files that are under the package include list\r
+        headerFileDependencySet = set()\r
+        localSourceDir = str(self._AutoGenObject.SourceDir).lower()\r
+        for Dependency in FileDependencyDict.values():\r
+            for aFile in Dependency:\r
+                aFileName = str(aFile).lower()\r
+                # Exclude non-header files\r
+                if not aFileName.endswith('.h'):\r
+                    continue\r
+                # Exclude autogen files\r
+                if aFileName in localAutoGenFileSet:\r
+                    continue\r
+                # Exclude include out of local scope\r
+                if localSourceDir not in aFileName:\r
+                    continue\r
+                # Exclude files covered by package includes\r
+                pathNeeded = True\r
+                for aIncludePath in parentMetaFileIncludes:\r
+                    if aIncludePath in aFileName:\r
+                        pathNeeded = False\r
+                        break\r
+                if not pathNeeded:\r
+                    continue\r
+                # Keep the file to be checked\r
+                headerFileDependencySet.add(aFileName)\r
+\r
+        # Check if a module dependency header file is missing from the module's MetaFile\r
+        for aFile in headerFileDependencySet:\r
+            if aFile in headerFilesInMetaFileSet:\r
+                continue\r
+            if GlobalData.gUseHashCache:\r
+                GlobalData.gModuleBuildTracking[self._AutoGenObject] = 'FAIL_METAFILE'\r
+            EdkLogger.warn("build","Module MetaFile [Sources] is missing local header!",\r
+                        ExtraData = "Local Header: " + aFile + " not found in " + self._AutoGenObject.MetaFile.Path\r
+                        )\r
+\r
         DepSet = None\r
         for File,Dependency in FileDependencyDict.items():\r
             if not Dependency:\r
@@ -939,6 +996,10 @@ cleanlib:
         for File in DepSet:\r
             self.CommonFileDependency.append(self.PlaceMacro(File.Path, self.Macros))\r
 \r
+        CmdSumDict = {}\r
+        CmdTargetDict = {}\r
+        CmdCppDict = {}\r
+        DependencyDict = FileDependencyDict.copy()\r
         for File in FileDependencyDict:\r
             # skip non-C files\r
             if File.Ext not in [".c", ".C"] or File.Name == "AutoGen.c":\r
@@ -946,8 +1007,15 @@ cleanlib:
             NewDepSet = set(FileDependencyDict[File])\r
             NewDepSet -= DepSet\r
             FileDependencyDict[File] = ["$(COMMON_DEPS)"] + list(NewDepSet)\r
+            DependencyDict[File] = list(NewDepSet)\r
 \r
         # Convert target description object to target string in makefile\r
+        if self._AutoGenObject.BuildRuleFamily == TAB_COMPILER_MSFT and TAB_C_CODE_FILE in self._AutoGenObject.Targets:\r
+            for T in self._AutoGenObject.Targets[TAB_C_CODE_FILE]:\r
+                NewFile = self.PlaceMacro(str(T), self.Macros)\r
+                if not self.ObjTargetDict.get(T.Target.SubDir):\r
+                    self.ObjTargetDict[T.Target.SubDir] = set()\r
+                self.ObjTargetDict[T.Target.SubDir].add(NewFile)\r
         for Type in self._AutoGenObject.Targets:\r
             for T in self._AutoGenObject.Targets[Type]:\r
                 # Generate related macros if needed\r
@@ -959,9 +1027,12 @@ cleanlib:
                     self.ListFileMacros[T.IncListFileMacro] = []\r
 \r
                 Deps = []\r
+                CCodeDeps = []\r
                 # Add force-dependencies\r
                 for Dep in T.Dependencies:\r
                     Deps.append(self.PlaceMacro(str(Dep), self.Macros))\r
+                    if Dep != '$(MAKE_FILE)':\r
+                        CCodeDeps.append(self.PlaceMacro(str(Dep), self.Macros))\r
                 # Add inclusion-dependencies\r
                 if len(T.Inputs) == 1 and T.Inputs[0] in FileDependencyDict:\r
                     for F in FileDependencyDict[T.Inputs[0]]:\r
@@ -971,27 +1042,84 @@ cleanlib:
                     NewFile = self.PlaceMacro(str(F), self.Macros)\r
                     # In order to use file list macro as dependency\r
                     if T.GenListFile:\r
-                        # gnu tools need forward slash path separater, even on Windows\r
+                        # gnu tools need forward slash path separator, even on Windows\r
                         self.ListFileMacros[T.ListFileMacro].append(str(F).replace ('\\', '/'))\r
                         self.FileListMacros[T.FileListMacro].append(NewFile)\r
                     elif T.GenFileListMacro:\r
                         self.FileListMacros[T.FileListMacro].append(NewFile)\r
                     else:\r
                         Deps.append(NewFile)\r
-\r
+                for key in self.FileListMacros:\r
+                    self.FileListMacros[key].sort()\r
                 # Use file list macro as dependency\r
                 if T.GenFileListMacro:\r
                     Deps.append("$(%s)" % T.FileListMacro)\r
                     if Type in [TAB_OBJECT_FILE, TAB_STATIC_LIBRARY]:\r
                         Deps.append("$(%s)" % T.ListFileMacro)\r
 \r
-                TargetDict = {\r
-                    "target"    :   self.PlaceMacro(T.Target.Path, self.Macros),\r
-                    "cmd"       :   "\n\t".join(T.Commands),\r
-                    "deps"      :   Deps\r
-                }\r
-                self.BuildTargetList.append(self._BUILD_TARGET_TEMPLATE.Replace(TargetDict))\r
-\r
+                if self._AutoGenObject.BuildRuleFamily == TAB_COMPILER_MSFT and Type == TAB_C_CODE_FILE:\r
+                    T, CmdTarget, CmdTargetDict, CmdCppDict = self.ParserCCodeFile(T, Type, CmdSumDict, CmdTargetDict, CmdCppDict, DependencyDict)\r
+                    TargetDict = {"target": self.PlaceMacro(T.Target.Path, self.Macros), "cmd": "\n\t".join(T.Commands),"deps": CCodeDeps}\r
+                    CmdLine = self._BUILD_TARGET_TEMPLATE.Replace(TargetDict).rstrip().replace('\t$(OBJLIST', '$(OBJLIST')\r
+                    if T.Commands:\r
+                        CmdLine = '%s%s' %(CmdLine, TAB_LINE_BREAK)\r
+                    if CCodeDeps or CmdLine:\r
+                        self.BuildTargetList.append(CmdLine)\r
+                else:\r
+                    TargetDict = {"target": self.PlaceMacro(T.Target.Path, self.Macros), "cmd": "\n\t".join(T.Commands),"deps": Deps}\r
+                    self.BuildTargetList.append(self._BUILD_TARGET_TEMPLATE.Replace(TargetDict))\r
+\r
+    def ParserCCodeFile(self, T, Type, CmdSumDict, CmdTargetDict, CmdCppDict, DependencyDict):\r
+        if not CmdSumDict:\r
+            for item in self._AutoGenObject.Targets[Type]:\r
+                CmdSumDict[item.Target.SubDir] = item.Target.BaseName\r
+                for CppPath in item.Inputs:\r
+                    Path = self.PlaceMacro(CppPath.Path, self.Macros)\r
+                    if CmdCppDict.get(item.Target.SubDir):\r
+                        CmdCppDict[item.Target.SubDir].append(Path)\r
+                    else:\r
+                        CmdCppDict[item.Target.SubDir] = ['$(MAKE_FILE)', Path]\r
+                    if CppPath.Path in DependencyDict:\r
+                        if '$(FORCE_REBUILD)' in DependencyDict[CppPath.Path]:\r
+                            if '$(FORCE_REBUILD)' not in (self.CommonFileDependency + CmdCppDict[item.Target.SubDir]):\r
+                                CmdCppDict[item.Target.SubDir].append('$(FORCE_REBUILD)')\r
+                        else:\r
+                            for Temp in DependencyDict[CppPath.Path]:\r
+                                try:\r
+                                    Path = self.PlaceMacro(Temp.Path, self.Macros)\r
+                                except:\r
+                                    continue\r
+                                if Path not in (self.CommonFileDependency + CmdCppDict[item.Target.SubDir]):\r
+                                    CmdCppDict[item.Target.SubDir].append(Path)\r
+        if T.Commands:\r
+            CommandList = T.Commands[:]\r
+            for Item in CommandList[:]:\r
+                SingleCommandList = Item.split()\r
+                if len(SingleCommandList) > 0 and self.CheckCCCmd(SingleCommandList):\r
+                    for Temp in SingleCommandList:\r
+                        if Temp.startswith('/Fo'):\r
+                            CmdSign = '%s%s' % (Temp.rsplit(TAB_SLASH, 1)[0], TAB_SLASH)\r
+                            break\r
+                    else: continue\r
+                    if CmdSign not in list(CmdTargetDict.keys()):\r
+                        CmdTargetDict[CmdSign] = Item.replace(Temp, CmdSign)\r
+                    else:\r
+                        CmdTargetDict[CmdSign] = "%s %s" % (CmdTargetDict[CmdSign], SingleCommandList[-1])\r
+                    Index = CommandList.index(Item)\r
+                    CommandList.pop(Index)\r
+                    if SingleCommandList[-1].endswith("%s%s.c" % (TAB_SLASH, CmdSumDict[CmdSign[3:].rsplit(TAB_SLASH, 1)[0]])):\r
+                        Cpplist = CmdCppDict[T.Target.SubDir]\r
+                        Cpplist.insert(0, '$(OBJLIST_%d): $(COMMON_DEPS)' % list(self.ObjTargetDict.keys()).index(T.Target.SubDir))\r
+                        T.Commands[Index] = '%s\n\t%s' % (' \\\n\t'.join(Cpplist), CmdTargetDict[CmdSign])\r
+                    else:\r
+                        T.Commands.pop(Index)\r
+        return T, CmdSumDict, CmdTargetDict, CmdCppDict\r
+\r
+    def CheckCCCmd(self, CommandList):\r
+        for cmd in CommandList:\r
+            if '$(CC)' in cmd:\r
+                return True\r
+        return False\r
     ## For creating makefile targets for dependent libraries\r
     def ProcessDependentLibrary(self):\r
         for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:\r
@@ -1009,110 +1137,9 @@ cleanlib:
     def GetFileDependency(self, FileList, ForceInculeList, SearchPathList):\r
         Dependency = {}\r
         for F in FileList:\r
-            Dependency[F] = self.GetDependencyList(F, ForceInculeList, SearchPathList)\r
+            Dependency[F] = GetDependencyList(self._AutoGenObject, self.FileCache, F, ForceInculeList, SearchPathList)\r
         return Dependency\r
 \r
-    ## Find dependencies for one source file\r
-    #\r
-    #  By searching recursively "#include" directive in file, find out all the\r
-    #  files needed by given source file. The dependecies will be only searched\r
-    #  in given search path list.\r
-    #\r
-    #   @param      File            The source file\r
-    #   @param      ForceInculeList The list of files which will be included forcely\r
-    #   @param      SearchPathList  The list of search path\r
-    #\r
-    #   @retval     list            The list of files the given source file depends on\r
-    #\r
-    def GetDependencyList(self, File, ForceList, SearchPathList):\r
-        EdkLogger.debug(EdkLogger.DEBUG_1, "Try to get dependency files for %s" % File)\r
-        FileStack = [File] + ForceList\r
-        DependencySet = set()\r
-\r
-        if self._AutoGenObject.Arch not in gDependencyDatabase:\r
-            gDependencyDatabase[self._AutoGenObject.Arch] = {}\r
-        DepDb = gDependencyDatabase[self._AutoGenObject.Arch]\r
-\r
-        while len(FileStack) > 0:\r
-            F = FileStack.pop()\r
-\r
-            FullPathDependList = []\r
-            if F in self.FileCache:\r
-                for CacheFile in self.FileCache[F]:\r
-                    FullPathDependList.append(CacheFile)\r
-                    if CacheFile not in DependencySet:\r
-                        FileStack.append(CacheFile)\r
-                DependencySet.update(FullPathDependList)\r
-                continue\r
-\r
-            CurrentFileDependencyList = []\r
-            if F in DepDb:\r
-                CurrentFileDependencyList = DepDb[F]\r
-            else:\r
-                try:\r
-                    Fd = open(F.Path, 'r')\r
-                except BaseException as X:\r
-                    EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path + "\n\t" + str(X))\r
-\r
-                FileContent = Fd.read()\r
-                Fd.close()\r
-                if len(FileContent) == 0:\r
-                    continue\r
-\r
-                if FileContent[0] == 0xff or FileContent[0] == 0xfe:\r
-                    FileContent = unicode(FileContent, "utf-16")\r
-                IncludedFileList = gIncludePattern.findall(FileContent)\r
-\r
-                for Inc in IncludedFileList:\r
-                    Inc = Inc.strip()\r
-                    # if there's macro used to reference header file, expand it\r
-                    HeaderList = gMacroPattern.findall(Inc)\r
-                    if len(HeaderList) == 1 and len(HeaderList[0]) == 2:\r
-                        HeaderType = HeaderList[0][0]\r
-                        HeaderKey = HeaderList[0][1]\r
-                        if HeaderType in gIncludeMacroConversion:\r
-                            Inc = gIncludeMacroConversion[HeaderType] % {"HeaderKey" : HeaderKey}\r
-                        else:\r
-                            # not known macro used in #include, always build the file by\r
-                            # returning a empty dependency\r
-                            self.FileCache[File] = []\r
-                            return []\r
-                    Inc = os.path.normpath(Inc)\r
-                    CurrentFileDependencyList.append(Inc)\r
-                DepDb[F] = CurrentFileDependencyList\r
-\r
-            CurrentFilePath = F.Dir\r
-            PathList = [CurrentFilePath] + SearchPathList\r
-            for Inc in CurrentFileDependencyList:\r
-                for SearchPath in PathList:\r
-                    FilePath = os.path.join(SearchPath, Inc)\r
-                    if FilePath in gIsFileMap:\r
-                        if not gIsFileMap[FilePath]:\r
-                            continue\r
-                    # If isfile is called too many times, the performance is slow down.\r
-                    elif not os.path.isfile(FilePath):\r
-                        gIsFileMap[FilePath] = False\r
-                        continue\r
-                    else:\r
-                        gIsFileMap[FilePath] = True\r
-                    FilePath = PathClass(FilePath)\r
-                    FullPathDependList.append(FilePath)\r
-                    if FilePath not in DependencySet:\r
-                        FileStack.append(FilePath)\r
-                    break\r
-                else:\r
-                    EdkLogger.debug(EdkLogger.DEBUG_9, "%s included by %s was not found "\\r
-                                    "in any given path:\n\t%s" % (Inc, F, "\n\t".join(SearchPathList)))\r
-\r
-            self.FileCache[F] = FullPathDependList\r
-            DependencySet.update(FullPathDependList)\r
-\r
-        DependencySet.update(ForceList)\r
-        if File in DependencySet:\r
-            DependencySet.remove(File)\r
-        DependencyList = list(DependencySet)  # remove duplicate ones\r
-\r
-        return DependencyList\r
 \r
 ## CustomMakefile class\r
 #\r
@@ -1220,6 +1247,7 @@ ${BEGIN}\t-@${create_directory_command}\n${END}\
         BuildFile.__init__(self, ModuleAutoGen)\r
         self.PlatformInfo = self._AutoGenObject.PlatformInfo\r
         self.IntermediateDirectoryList = ["$(DEBUG_DIR)", "$(OUTPUT_DIR)"]\r
+        self.DependencyHeaderFileSet = set()\r
 \r
     # Compose a dict object containing information used to do replacement in template\r
     @property\r
@@ -1287,8 +1315,8 @@ ${BEGIN}\t-@${create_directory_command}\n${END}\
             "separator"                 : Separator,\r
             "module_tool_definitions"   : ToolsDef,\r
 \r
-            "shell_command_code"        : self._SHELL_CMD_[self._FileType].keys(),\r
-            "shell_command"             : self._SHELL_CMD_[self._FileType].values(),\r
+            "shell_command_code"        : list(self._SHELL_CMD_[self._FileType].keys()),\r
+            "shell_command"             : list(self._SHELL_CMD_[self._FileType].values()),\r
 \r
             "create_directory_command"  : self.GetCreateDirectoryCommand(self.IntermediateDirectoryList),\r
             "custom_makefile_content"   : CustomMakefile\r
@@ -1410,6 +1438,7 @@ cleanlib:
         self.ModuleBuildDirectoryList = []\r
         self.LibraryBuildDirectoryList = []\r
         self.LibraryMakeCommandList = []\r
+        self.DependencyHeaderFileSet = set()\r
 \r
     # Compose a dict object containing information used to do replacement in template\r
     @property\r
@@ -1461,8 +1490,8 @@ cleanlib:
 \r
             "toolchain_tag"             : MyAgo.ToolChain,\r
             "build_target"              : MyAgo.BuildTarget,\r
-            "shell_command_code"        : self._SHELL_CMD_[self._FileType].keys(),\r
-            "shell_command"             : self._SHELL_CMD_[self._FileType].values(),\r
+            "shell_command_code"        : list(self._SHELL_CMD_[self._FileType].keys()),\r
+            "shell_command"             : list(self._SHELL_CMD_[self._FileType].values()),\r
             "build_architecture_list"   : MyAgo.Arch,\r
             "architecture"              : MyAgo.Arch,\r
             "separator"                 : Separator,\r
@@ -1515,6 +1544,7 @@ class TopLevelMakefile(BuildFile):
     def __init__(self, Workspace):\r
         BuildFile.__init__(self, Workspace)\r
         self.IntermediateDirectoryList = []\r
+        self.DependencyHeaderFileSet = set()\r
 \r
     # Compose a dict object containing information used to do replacement in template\r
     @property\r
@@ -1537,13 +1567,9 @@ class TopLevelMakefile(BuildFile):
         if MyAgo.FdfFile is not None and MyAgo.FdfFile != "":\r
             FdfFileList = [MyAgo.FdfFile]\r
             # macros passed to GenFds\r
-            MacroList.append('"%s=%s"' % ("EFI_SOURCE", GlobalData.gEfiSource.replace('\\', '\\\\')))\r
-            MacroList.append('"%s=%s"' % ("EDK_SOURCE", GlobalData.gEdkSource.replace('\\', '\\\\')))\r
             MacroDict = {}\r
             MacroDict.update(GlobalData.gGlobalDefines)\r
             MacroDict.update(GlobalData.gCommandLineDefines)\r
-            MacroDict.pop("EFI_SOURCE", "dummy")\r
-            MacroDict.pop("EDK_SOURCE", "dummy")\r
             for MacroName in MacroDict:\r
                 if MacroDict[MacroName] != "":\r
                     MacroList.append('"%s=%s"' % (MacroName, MacroDict[MacroName].replace('\\', '\\\\')))\r
@@ -1564,8 +1590,8 @@ class TopLevelMakefile(BuildFile):
 \r
         if GlobalData.gCaseInsensitive:\r
             ExtraOption += " -c"\r
-        if GlobalData.gEnableGenfdsMultiThread:\r
-            ExtraOption += " --genfds-multi-thread"\r
+        if not GlobalData.gEnableGenfdsMultiThread:\r
+            ExtraOption += " --no-genfds-multi-thread"\r
         if GlobalData.gIgnoreSource:\r
             ExtraOption += " --ignore-sources"\r
 \r
@@ -1597,8 +1623,8 @@ class TopLevelMakefile(BuildFile):
 \r
             "toolchain_tag"             : MyAgo.ToolChain,\r
             "build_target"              : MyAgo.BuildTarget,\r
-            "shell_command_code"        : self._SHELL_CMD_[self._FileType].keys(),\r
-            "shell_command"             : self._SHELL_CMD_[self._FileType].values(),\r
+            "shell_command_code"        : list(self._SHELL_CMD_[self._FileType].keys()),\r
+            "shell_command"             : list(self._SHELL_CMD_[self._FileType].values()),\r
             'arch'                      : list(MyAgo.ArchList),\r
             "build_architecture_list"   : ','.join(MyAgo.ArchList),\r
             "separator"                 : Separator,\r
@@ -1638,7 +1664,112 @@ class TopLevelMakefile(BuildFile):
                 DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
         return DirList\r
 \r
+## Find dependencies for one source file\r
+#\r
+#  By searching recursively "#include" directive in file, find out all the\r
+#  files needed by given source file. The dependencies will be only searched\r
+#  in given search path list.\r
+#\r
+#   @param      File            The source file\r
+#   @param      ForceInculeList The list of files which will be included forcely\r
+#   @param      SearchPathList  The list of search path\r
+#\r
+#   @retval     list            The list of files the given source file depends on\r
+#\r
+def GetDependencyList(AutoGenObject, FileCache, File, ForceList, SearchPathList):\r
+    EdkLogger.debug(EdkLogger.DEBUG_1, "Try to get dependency files for %s" % File)\r
+    FileStack = [File] + ForceList\r
+    DependencySet = set()\r
+\r
+    if AutoGenObject.Arch not in gDependencyDatabase:\r
+        gDependencyDatabase[AutoGenObject.Arch] = {}\r
+    DepDb = gDependencyDatabase[AutoGenObject.Arch]\r
+\r
+    while len(FileStack) > 0:\r
+        F = FileStack.pop()\r
+\r
+        FullPathDependList = []\r
+        if F in FileCache:\r
+            for CacheFile in FileCache[F]:\r
+                FullPathDependList.append(CacheFile)\r
+                if CacheFile not in DependencySet:\r
+                    FileStack.append(CacheFile)\r
+            DependencySet.update(FullPathDependList)\r
+            continue\r
+\r
+        CurrentFileDependencyList = []\r
+        if F in DepDb:\r
+            CurrentFileDependencyList = DepDb[F]\r
+        else:\r
+            try:\r
+                Fd = open(F.Path, 'rb')\r
+                FileContent = Fd.read()\r
+                Fd.close()\r
+            except BaseException as X:\r
+                EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path + "\n\t" + str(X))\r
+            if len(FileContent) == 0:\r
+                continue\r
+            try:\r
+                if FileContent[0] == 0xff or FileContent[0] == 0xfe:\r
+                    FileContent = FileContent.decode('utf-16')\r
+                else:\r
+                    FileContent = FileContent.decode()\r
+            except:\r
+                # The file is not txt file. for example .mcb file\r
+                continue\r
+            IncludedFileList = gIncludePattern.findall(FileContent)\r
+\r
+            for Inc in IncludedFileList:\r
+                Inc = Inc.strip()\r
+                # if there's macro used to reference header file, expand it\r
+                HeaderList = gMacroPattern.findall(Inc)\r
+                if len(HeaderList) == 1 and len(HeaderList[0]) == 2:\r
+                    HeaderType = HeaderList[0][0]\r
+                    HeaderKey = HeaderList[0][1]\r
+                    if HeaderType in gIncludeMacroConversion:\r
+                        Inc = gIncludeMacroConversion[HeaderType] % {"HeaderKey" : HeaderKey}\r
+                    else:\r
+                        # not known macro used in #include, always build the file by\r
+                        # returning a empty dependency\r
+                        FileCache[File] = []\r
+                        return []\r
+                Inc = os.path.normpath(Inc)\r
+                CurrentFileDependencyList.append(Inc)\r
+            DepDb[F] = CurrentFileDependencyList\r
+\r
+        CurrentFilePath = F.Dir\r
+        PathList = [CurrentFilePath] + SearchPathList\r
+        for Inc in CurrentFileDependencyList:\r
+            for SearchPath in PathList:\r
+                FilePath = os.path.join(SearchPath, Inc)\r
+                if FilePath in gIsFileMap:\r
+                    if not gIsFileMap[FilePath]:\r
+                        continue\r
+                # If isfile is called too many times, the performance is slow down.\r
+                elif not os.path.isfile(FilePath):\r
+                    gIsFileMap[FilePath] = False\r
+                    continue\r
+                else:\r
+                    gIsFileMap[FilePath] = True\r
+                FilePath = PathClass(FilePath)\r
+                FullPathDependList.append(FilePath)\r
+                if FilePath not in DependencySet:\r
+                    FileStack.append(FilePath)\r
+                break\r
+            else:\r
+                EdkLogger.debug(EdkLogger.DEBUG_9, "%s included by %s was not found "\\r
+                                "in any given path:\n\t%s" % (Inc, F, "\n\t".join(SearchPathList)))\r
+\r
+        FileCache[F] = FullPathDependList\r
+        DependencySet.update(FullPathDependList)\r
+\r
+    DependencySet.update(ForceList)\r
+    if File in DependencySet:\r
+        DependencySet.remove(File)\r
+    DependencyList = list(DependencySet)  # remove duplicate ones\r
+\r
+    return DependencyList\r
+\r
 # This acts like the main() function for the script, unless it is 'import'ed into another script.\r
 if __name__ == '__main__':\r
     pass\r
-\r