License header updated to match correct format.

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / DepexSection.py

diff --git a/BaseTools/Source/Python/GenFds/DepexSection.py b/BaseTools/Source/Python/GenFds/DepexSection.py
index a0a1905dfae1ce914e784effe6659999a2fee6e4..8f78c0fad474fb38829160b94cd3331c4127dea1 100644 (file)
--- a/BaseTools/Source/Python/GenFds/DepexSection.py
+++ b/BaseTools/Source/Python/GenFds/DepexSection.py
@@ -1,9 +1,9 @@
 ## @file\r
 # process depex section generation\r
 #\r
-#  Copyright (c) 2007, Intel Corporation\r
+#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
-#  All rights reserved. This program and the accompanying materials\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
@@ -19,12 +19,12 @@ import Section
 from GenFdsGlobalVariable import GenFdsGlobalVariable\r
 import subprocess\r
 from Ffs import Ffs\r
-import os\r
+import Common.LongFilePathOs as os\r
 from CommonDataClass.FdfClass import DepexSectionClassObject\r
 from AutoGen.GenDepex import DependencyExpression\r
-import shutil\r
 from Common import EdkLogger\r
 from Common.BuildToolError import *\r
+from Common.Misc import PathClass\r
 \r
 ## generate data section\r
 #\r
@@ -39,7 +39,22 @@ class DepexSection (DepexSectionClassObject):
 \r
     def __FindGuidValue(self, CName):\r
         for Arch in GenFdsGlobalVariable.ArchList:\r
-            for PkgDb in GenFdsGlobalVariable.WorkSpace.PackageList:\r
+            PkgList = GenFdsGlobalVariable.WorkSpace.GetPackageList(GenFdsGlobalVariable.ActivePlatform,\r
+                                                                    Arch,\r
+                                                                    GenFdsGlobalVariable.TargetName,\r
+                                                                    GenFdsGlobalVariable.ToolChainTag)\r
+            for Inf in GenFdsGlobalVariable.FdfParser.Profile.InfList:\r
+                ModuleFile = PathClass(Inf, GenFdsGlobalVariable.WorkSpaceDir)\r
+                ModuleData = GenFdsGlobalVariable.WorkSpace.BuildObject[\r
+                                                            ModuleFile,\r
+                                                            Arch,\r
+                                                            GenFdsGlobalVariable.TargetName,\r
+                                                            GenFdsGlobalVariable.ToolChainTag\r
+                                                            ]\r
+                for Pkg in ModuleData.Packages:\r
+                    if Pkg not in PkgList:\r
+                        PkgList.append(Pkg)\r
+            for PkgDb in PkgList:\r
                 if CName in PkgDb.Ppis:\r
                     return PkgDb.Ppis[CName]\r
                 if CName in PkgDb.Protocols:\r
@@ -62,24 +77,27 @@ class DepexSection (DepexSectionClassObject):
     #   @retval tuple       (Generated file name list, section alignment)\r
     #\r
     def GenSection(self, OutputPath, ModuleName, SecNum, keyStringList, FfsFile = None, Dict = {}):\r
+        \r
+        if self.ExpressionProcessed == False:\r
+            self.Expression = self.Expression.replace("\n", " ").replace("\r", " ")\r
+            ExpList = self.Expression.split()\r
+            ExpGuidDict = {}\r
 \r
-        self.Expression = self.Expression.replace("\n", " ").replace("\r", " ")\r
-        ExpList = self.Expression.split()\r
-        ExpGuidDict = {}\r
+            for Exp in ExpList:\r
+                if Exp.upper() not in ('AND', 'OR', 'NOT', 'TRUE', 'FALSE', 'SOR', 'BEFORE', 'AFTER', 'END'):\r
+                    GuidStr = self.__FindGuidValue(Exp)\r
+                    if GuidStr == None:\r
+                        EdkLogger.error("GenFds", RESOURCE_NOT_AVAILABLE,\r
+                                        "Depex GUID %s could not be found in build DB! (ModuleName: %s)" % (Exp, ModuleName))\r
 \r
-        for Exp in ExpList:\r
-            if Exp.upper() not in ('AND', 'OR', 'NOT', 'TRUE', 'FALSE', 'SOR', 'BEFORE', 'AFTER', 'END'):\r
-                GuidStr = self.__FindGuidValue(Exp)\r
-                if GuidStr == None:\r
-                    EdkLogger.error("GenFds", RESOURCE_NOT_AVAILABLE,\r
-                                    "Depex GUID %s could not be found in build DB! (ModuleName: %s)" % (Exp, ModuleName))\r
+                    ExpGuidDict[Exp] = GuidStr\r
 \r
-                ExpGuidDict[Exp] = GuidStr\r
+            for Item in ExpGuidDict:\r
+                self.Expression = self.Expression.replace(Item, ExpGuidDict[Item])\r
 \r
-        for Item in ExpGuidDict:\r
-            self.Expression = self.Expression.replace(Item, ExpGuidDict[Item])\r
+            self.Expression = self.Expression.strip()\r
+            self.ExpressionProcessed = True\r
 \r
-        self.Expression = self.Expression.strip()\r
         if self.DepexType == 'PEI_DEPEX_EXP':\r
             ModuleType = 'PEIM'\r
             SecType    = 'PEI_DEPEX'\r