]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/Workspace/DscBuildData.py
BaseTools: Remove 'COMMON' in PCD SkuInfoList
[mirror_edk2.git] / BaseTools / Source / Python / Workspace / DscBuildData.py
index 135b608ad2714c5597b54b7c1271326978022111..a9117afa5cebb2246cfff2bbddc843b44173c90c 100644 (file)
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to create a database used by build tool\r
 #\r
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR>\r
 # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -23,7 +23,8 @@ from Common.Misc import *
 from types import *\r
 \r
 from CommonDataClass.CommonClass import SkuInfoClass\r
-\r
+from Common.TargetTxtClassObject import *\r
+from Common.ToolDefClassObject import *\r
 from MetaDataTable import *\r
 from MetaFileTable import *\r
 from MetaFileParser import *\r
@@ -77,11 +78,11 @@ PcdMakefileHeader = '''
 \r
 '''\r
 \r
+WindowsCFLAGS = 'CFLAGS = $(CFLAGS) /wd4200 /wd4034 /wd4101 '\r
+LinuxCFLAGS = 'BUILD_CFLAGS += -Wno-pointer-to-int-cast -Wno-unused-variable '\r
 PcdMakefileEnd = '''\r
 !INCLUDE $(BASE_TOOLS_PATH)\Source\C\Makefiles\ms.common\r
 \r
-CFLAGS = $(CFLAGS) /wd4200 /wd4034 /wd4101\r
-\r
 LIBS = $(LIB_PATH)\Common.lib\r
 \r
 !INCLUDE $(BASE_TOOLS_PATH)\Source\C\Makefiles\ms.app\r
@@ -152,6 +153,7 @@ class DscBuildData(PlatformBuildClassObject):
         self._Arch = Arch\r
         self._Target = Target\r
         self._Toolchain = Toolchain\r
+        self._ToolChainFamily = None\r
         self._Clear()\r
         self._HandleOverridePath()\r
         if os.getenv("WORKSPACE"):\r
@@ -798,7 +800,7 @@ class DscBuildData(PlatformBuildClassObject):
                 ModuleData = self._Bdb[ModuleFile, self._Arch, self._Target, self._Toolchain]\r
                 PkgSet.update(ModuleData.Packages)\r
 \r
-            self._DecPcds = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain,PkgSet)\r
+            self._DecPcds, self._GuidDict = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain,PkgSet)\r
 \r
 \r
         if (PcdCName, TokenSpaceGuid) not in self._DecPcds:\r
@@ -819,6 +821,8 @@ class DscBuildData(PlatformBuildClassObject):
                 ValueList[Index] = ValueExpression(ValueList[Index], GlobalData.gPlatformPcds)(True)\r
             except WrnExpression, Value:\r
                 ValueList[Index] = Value.result\r
+            except BadExpression, Value:\r
+                EdkLogger.error('Parser', FORMAT_INVALID, Value, File=self.MetaFile, Line=self._LineIndex + 1)\r
             except EvaluationException, Excpt:\r
                 if hasattr(Excpt, 'Pcd'):\r
                     if Excpt.Pcd in GlobalData.gPlatformOtherPcds:\r
@@ -832,11 +836,13 @@ class DscBuildData(PlatformBuildClassObject):
                 else:\r
                     EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expression: %s" % str(Excpt),\r
                                     File=self.MetaFile, Line=LineNo)\r
-            if ValueList[Index] == 'True':\r
-                ValueList[Index] = '1'\r
-            elif ValueList[Index] == 'False':\r
-                ValueList[Index] = '0'\r
         if ValueList[Index]:\r
+            DatumType = self._DecPcds[PcdCName, TokenSpaceGuid].DatumType\r
+            try:\r
+                ValueList[Index] = ValueExpressionEx(ValueList[Index], DatumType, self._GuidDict)(True)\r
+            except BadExpression, Value:\r
+                EdkLogger.error('Parser', FORMAT_INVALID, Value, File=self.MetaFile, Line=LineNo,\r
+                                ExtraData="PCD [%s.%s] Value \"%s\" " % (TokenSpaceGuid, PcdCName, ValueList[Index]))\r
             Valid, ErrStr = CheckPcdDatum(self._DecPcds[PcdCName, TokenSpaceGuid].DatumType, ValueList[Index])\r
             if not Valid:\r
                 EdkLogger.error('build', FORMAT_INVALID, ErrStr, File=self.MetaFile, Line=LineNo,\r
@@ -1012,7 +1018,7 @@ class DscBuildData(PlatformBuildClassObject):
                             "Pcd (%s.%s) defined in DSC is not declared in DEC files. Arch: ['%s']" % (str_pcd[0], str_pcd[1], self._Arch),\r
                             File=self.MetaFile,Line = StrPcdSet[str_pcd][0][5])\r
         # Add the Structure PCD that only defined in DEC, don't have override in DSC file\r
-        for Pcd in self._DecPcds:\r
+        for Pcd in self.DecPcds:\r
             if type (self._DecPcds[Pcd]) is StructurePcd:\r
                 if Pcd not in S_pcd_set:\r
                     str_pcd_obj_str = StructurePcd()\r
@@ -1458,7 +1464,7 @@ class DscBuildData(PlatformBuildClassObject):
         else:\r
             MakeApp = MakeApp + PcdGccMakefile\r
             MakeApp = MakeApp + 'APPNAME = %s\n' % (PcdValueInitName) + 'OBJECTS = %s/%s.o\n' % (self.OutputPath, PcdValueInitName) + \\r
-                      'include $(MAKEROOT)/Makefiles/app.makefile\n' + 'BUILD_CFLAGS += -Wno-pointer-to-int-cast -Wno-unused-variable\n' + 'INCLUDE +='\r
+                      'include $(MAKEROOT)/Makefiles/app.makefile\n' + 'INCLUDE +='\r
 \r
         PlatformInc = {}\r
         for Cache in self._Bdb._CACHE_.values():\r
@@ -1483,6 +1489,50 @@ class DscBuildData(PlatformBuildClassObject):
                     for inc in PlatformInc[pkg]:\r
                         MakeApp += '-I'  + str(inc) + ' '\r
         MakeApp = MakeApp + '\n'\r
+\r
+        CC_FLAGS = LinuxCFLAGS\r
+        if sys.platform == "win32":\r
+            CC_FLAGS = WindowsCFLAGS\r
+        BuildOptions = {}\r
+        for Options in self.BuildOptions:\r
+            if Options[2] != EDKII_NAME:\r
+                continue\r
+            Family = Options[0]\r
+            if Family and Family != self.ToolChainFamily:\r
+                continue\r
+            Target, Tag, Arch, Tool, Attr = Options[1].split("_")\r
+            if Tool != 'CC':\r
+                continue\r
+\r
+            if Target == "*" or Target == self._Target:\r
+                if Tag == "*" or Tag == self._Toolchain:\r
+                    if Arch == "*" or Arch == self.Arch:\r
+                        if Tool not in BuildOptions:\r
+                            BuildOptions[Tool] = {}\r
+                        if Attr != "FLAGS" or Attr not in BuildOptions[Tool] or self.BuildOptions[Options].startswith('='):\r
+                            BuildOptions[Tool][Attr] = self.BuildOptions[Options]\r
+                        else:\r
+                            # append options for the same tool except PATH\r
+                            if Attr != 'PATH':\r
+                                BuildOptions[Tool][Attr] += " " + self.BuildOptions[Options]\r
+                            else:\r
+                                BuildOptions[Tool][Attr] = self.BuildOptions[Options]\r
+        if BuildOptions:\r
+            for Tool in BuildOptions:\r
+                for Attr in BuildOptions[Tool]:\r
+                    if Attr == "FLAGS":\r
+                        Value = BuildOptions[Tool][Attr]\r
+                        ValueList = Value.split()\r
+                        if ValueList:\r
+                            for Id, Item in enumerate(ValueList):\r
+                                if Item == '-D' or Item == '/D':\r
+                                    CC_FLAGS += ' ' + Item\r
+                                    if Id + 1 < len(ValueList):\r
+                                        CC_FLAGS += ' ' + ValueList[Id + 1]\r
+                                elif Item.startswith('/D') or Item.startswith('-D'):\r
+                                    CC_FLAGS += ' ' + Item\r
+        MakeApp += CC_FLAGS\r
+\r
         if sys.platform == "win32":\r
             MakeApp = MakeApp + PcdMakefileEnd\r
         MakeFileName = os.path.join(self.OutputPath, 'Makefile')\r
@@ -1666,8 +1716,7 @@ class DscBuildData(PlatformBuildClassObject):
     def CompletePcdValues(self,PcdSet):\r
         Pcds = {}\r
         DefaultStoreObj = DefaultStore(self._GetDefaultStores())\r
-        SkuIds = set([(skuid,skuobj.SkuId) for pcdobj in PcdSet.values() for skuid,skuobj in pcdobj.SkuInfoList.items()])\r
-        SkuIds = self.SkuIdMgr.AvailableSkuIdSet\r
+        SkuIds = {skuname:skuid for skuname,skuid in self.SkuIdMgr.AvailableSkuIdSet.items() if skuname !='COMMON'}\r
         DefaultStores = set([storename for pcdobj in PcdSet.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict.keys()])\r
         for PcdCName, TokenSpaceGuid in PcdSet:\r
             PcdObj = PcdSet[(PcdCName, TokenSpaceGuid)]\r
@@ -1964,6 +2013,28 @@ class DscBuildData(PlatformBuildClassObject):
             Module.MetaFile = FilePath\r
             self.Modules.append(Module)\r
 \r
+    def _GetToolChainFamily(self):\r
+        self._ToolChainFamily = "MSFT"\r
+        BuildConfigurationFile = os.path.normpath(os.path.join(GlobalData.gConfDirectory, "target.txt"))\r
+        if os.path.isfile(BuildConfigurationFile) == True:\r
+            TargetTxt      = TargetTxtClassObject()\r
+            TargetTxt.LoadTargetTxtFile(BuildConfigurationFile)\r
+            ToolDefinitionFile = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
+            if ToolDefinitionFile == '':\r
+                ToolDefinitionFile = "tools_def.txt"\r
+                ToolDefinitionFile = os.path.normpath(mws.join(self.WorkspaceDir, 'Conf', ToolDefinitionFile))\r
+            if os.path.isfile(ToolDefinitionFile) == True:\r
+                ToolDef        = ToolDefClassObject()\r
+                ToolDef.LoadToolDefFile(ToolDefinitionFile)\r
+                ToolDefinition = ToolDef.ToolsDefTxtDatabase\r
+                if TAB_TOD_DEFINES_FAMILY not in ToolDefinition \\r
+                   or self._Toolchain not in ToolDefinition[TAB_TOD_DEFINES_FAMILY] \\r
+                   or not ToolDefinition[TAB_TOD_DEFINES_FAMILY][self._Toolchain]:\r
+                    self._ToolChainFamily = "MSFT"\r
+                else:\r
+                    self._ToolChainFamily = ToolDefinition[TAB_TOD_DEFINES_FAMILY][self._Toolchain]\r
+        return self._ToolChainFamily\r
+\r
     ## Add external PCDs\r
     #\r
     #   The external PCDs are mostly those listed in FDF file to specify address\r
@@ -1977,7 +2048,21 @@ class DscBuildData(PlatformBuildClassObject):
         if (Name, Guid) not in self.Pcds:\r
             self.Pcds[Name, Guid] = PcdClassObject(Name, Guid, '', '', '', '', '', {}, False, None)\r
         self.Pcds[Name, Guid].DefaultValue = Value\r
-\r
+    @property\r
+    def DecPcds(self):\r
+        if self._DecPcds == None:\r
+            FdfInfList = []\r
+            if GlobalData.gFdfParser:\r
+                FdfInfList = GlobalData.gFdfParser.Profile.InfList\r
+            PkgSet = set()\r
+            for Inf in FdfInfList:\r
+                ModuleFile = PathClass(NormPath(Inf), GlobalData.gWorkspace, Arch=self._Arch)\r
+                if ModuleFile in self._Modules:\r
+                    continue\r
+                ModuleData = self._Bdb[ModuleFile, self._Arch, self._Target, self._Toolchain]\r
+                PkgSet.update(ModuleData.Packages)\r
+            self._DecPcds, self._GuidDict = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain,PkgSet)\r
+        return self._DecPcds\r
     _Macros             = property(_GetMacros)\r
     Arch                = property(_GetArch, _SetArch)\r
     Platform            = property(_GetPlatformName)\r
@@ -2008,3 +2093,4 @@ class DscBuildData(PlatformBuildClassObject):
     LibraryClasses      = property(_GetLibraryClasses)\r
     Pcds                = property(_GetPcds)\r
     BuildOptions        = property(_GetBuildOptions)\r
+    ToolChainFamily     = property(_GetToolChainFamily)\r