BaseTools: Add Platform Override Build Options for PcdValueInit

Add Platform's CC_FLAGS /D option for PcdValueInit generation.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index f43cd2a50fddcd98460da82ce30447ea315bfa04..e42210079dd39cc7a572c5282107c0198ad01409 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -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
@@ -1458,7 +1460,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 +1485,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
@@ -1964,6 +2010,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
@@ -2022,3 +2090,4 @@ class DscBuildData(PlatformBuildClassObject):
     LibraryClasses      = property(_GetLibraryClasses)\r
     Pcds                = property(_GetPcds)\r
     BuildOptions        = property(_GetBuildOptions)\r
+    ToolChainFamily     = property(_GetToolChainFamily)\r