from Common.DataType import *\r
from Common.Misc import *\r
from types import *\r
+from collections import OrderedDict\r
\r
from Workspace.BuildClassObject import PackageBuildClassObject, StructurePcd, PcdClassObject\r
\r
self._Ppis = None\r
self._Guids = None\r
self._Includes = None\r
+ self._CommonIncludes = None\r
self._LibraryClasses = None\r
self._Pcds = None\r
self.__Macros = None\r
\r
## Retrieve public include paths declared in this package\r
def _GetInclude(self):\r
- if self._Includes == None:\r
+ if self._Includes == None or self._CommonIncludes is None:\r
+ self._CommonIncludes = []\r
self._Includes = []\r
self._PrivateIncludes = []\r
PublicInclues = []\r
PublicInclues.append(File)\r
if File in self._PrivateIncludes:\r
EdkLogger.error('build', OPTION_CONFLICT, "Can't determine %s's attribute, it is both defined as Private and non-Private attribute in DEC file." % File, File=self.MetaFile, Line=LineNo)\r
-\r
+ if Record[3] == "COMMON":\r
+ self._CommonIncludes.append(File)\r
return self._Includes\r
\r
## Retrieve library class declarations (not used in build at present)\r
\r
\r
def ProcessStructurePcd(self, StructurePcdRawDataSet):\r
- s_pcd_set = dict()\r
+ s_pcd_set = OrderedDict()\r
for s_pcd,LineNo in StructurePcdRawDataSet:\r
if s_pcd.TokenSpaceGuidCName not in s_pcd_set:\r
s_pcd_set[s_pcd.TokenSpaceGuidCName] = []\r
Pcds[pcd.TokenCName, pcd.TokenSpaceGuidCName, self._PCD_TYPE_STRING_[Type]] = pcd\r
\r
return Pcds\r
+ @property\r
+ def CommonIncludes(self):\r
+ if self._CommonIncludes is None:\r
+ self.Includes\r
+ return self._CommonIncludes\r
\r
\r
_Macros = property(_GetMacros)\r