]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/AutoGen/AutoGen.py
BaseTools: not include the undefined macro in response file
[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / AutoGen.py
index dfb5b72b13f4270b2802cf1ed3d5a0751bd9d677..e9e46c29d73e719a221de4bc8ac48b71f254729b 100644 (file)
@@ -350,6 +350,67 @@ class WorkspaceAutoGen(AutoGen):
             DecPcds = {}\r
             DecPcdsKey = set()\r
             PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)\r
+            if GlobalData.BuildOptionPcd:\r
+                for i, pcd in enumerate(GlobalData.BuildOptionPcd):\r
+                    (pcdname, pcdvalue) = pcd.split('=')\r
+                    if not pcdvalue:\r
+                        EdkLogger.error('build', AUTOGEN_ERROR, "No Value specified for the PCD %s." % (pcdname))\r
+                    if '.' in pcdname:\r
+                        (TokenSpaceGuidCName, TokenCName) = pcdname.split('.')\r
+                        HasTokenSpace = True\r
+                    else:\r
+                        TokenCName = pcdname\r
+                        TokenSpaceGuidCName = ''\r
+                        HasTokenSpace = False\r
+                    TokenSpaceGuidCNameList = []\r
+                    FoundFlag = False\r
+                    PcdDatumType = ''\r
+                    NewValue = ''\r
+                    for package in PGen.PackageList:\r
+                        for key in package.Pcds:\r
+                            PcdItem = package.Pcds[key]\r
+                            if HasTokenSpace:\r
+                                if (PcdItem.TokenCName, PcdItem.TokenSpaceGuidCName) == (TokenCName, TokenSpaceGuidCName):\r
+                                    PcdDatumType = PcdItem.DatumType\r
+                                    NewValue = self._BuildOptionPcdValueFormat(TokenSpaceGuidCName, TokenCName, PcdDatumType, pcdvalue)\r
+                                    FoundFlag = True\r
+                            else:\r
+                                if PcdItem.TokenCName == TokenCName:\r
+                                    if not PcdItem.TokenSpaceGuidCName in TokenSpaceGuidCNameList:\r
+                                        if len (TokenSpaceGuidCNameList) < 1:\r
+                                            TokenSpaceGuidCNameList.append(PcdItem.TokenSpaceGuidCName)\r
+                                            PcdDatumType = PcdItem.DatumType\r
+                                            TokenSpaceGuidCName = PcdItem.TokenSpaceGuidCName\r
+                                            NewValue = self._BuildOptionPcdValueFormat(TokenSpaceGuidCName, TokenCName, PcdDatumType, pcdvalue)\r
+                                            FoundFlag = True\r
+                                        else:\r
+                                            EdkLogger.error(\r
+                                                    'build',\r
+                                                     AUTOGEN_ERROR,\r
+                                                    "The Pcd %s is found under multiple different TokenSpaceGuid: %s and %s." % (TokenCName, PcdItem.TokenSpaceGuidCName, TokenSpaceGuidCNameList[0])\r
+                                                    )\r
+\r
+                    GlobalData.BuildOptionPcd[i] = (TokenSpaceGuidCName, TokenCName, NewValue)\r
+\r
+                    if not FoundFlag:\r
+                        if HasTokenSpace:\r
+                            EdkLogger.error('build', AUTOGEN_ERROR, "The Pcd %s.%s is not found in the DEC file." % (TokenSpaceGuidCName, TokenCName))\r
+                        else:\r
+                            EdkLogger.error('build', AUTOGEN_ERROR, "The Pcd %s is not found in the DEC file." % (TokenCName))\r
+\r
+                    for BuildData in PGen.BuildDatabase._CACHE_.values():\r
+                        if BuildData.Arch != Arch:\r
+                            continue\r
+                        if BuildData.MetaFile.Ext == '.dec':\r
+                            continue\r
+                        for key in BuildData.Pcds:\r
+                            PcdItem = BuildData.Pcds[key]\r
+                            if (TokenSpaceGuidCName, TokenCName) == (PcdItem.TokenSpaceGuidCName, PcdItem.TokenCName):\r
+                                PcdItem.DefaultValue = NewValue\r
+\r
+                    if (TokenCName, TokenSpaceGuidCName) in PcdSet:\r
+                        PcdSet[(TokenCName, TokenSpaceGuidCName)] = NewValue\r
+\r
             #Collect package set information from INF of FDF\r
             PkgSet = set()\r
             for Inf in ModuleList:\r
@@ -418,6 +479,32 @@ class WorkspaceAutoGen(AutoGen):
 \r
         return True\r
 \r
+    def _BuildOptionPcdValueFormat(self, TokenSpaceGuidCName, TokenCName, PcdDatumType, Value):\r
+        if PcdDatumType == 'VOID*':\r
+            if Value.startswith('L'):\r
+                if not Value[1]:\r
+                    EdkLogger.error('build', OPTION_VALUE_INVALID, 'For Void* type PCD, when specify the Value in the command line, please use the following format: "string", L"string", B"{...}"')\r
+                Value = Value[0] + '"' + Value[1:] + '"'\r
+            elif Value.startswith('B'):\r
+                if not Value[1]:\r
+                    EdkLogger.error('build', OPTION_VALUE_INVALID, 'For Void* type PCD, when specify the Value in the command line, please use the following format: "string", L"string", B"{...}"')\r
+                Value = Value[1:]\r
+            else:\r
+                if not Value[0]:\r
+                    EdkLogger.error('build', OPTION_VALUE_INVALID, 'For Void* type PCD, when specify the Value in the command line, please use the following format: "string", L"string", B"{...}"')\r
+                Value = '"' + Value + '"'\r
+\r
+        IsValid, Cause = CheckPcdDatum(PcdDatumType, Value)\r
+        if not IsValid:\r
+            EdkLogger.error('build', FORMAT_INVALID, Cause, ExtraData="%s.%s" % (TokenSpaceGuidCName, TokenCName))\r
+        if PcdDatumType == 'BOOLEAN':\r
+            Value = Value.upper()\r
+            if Value == 'TRUE' or Value == '1':\r
+                Value = '1'\r
+            elif Value == 'FALSE' or Value == '0':\r
+                Value = '0'\r
+        return  Value\r
+\r
     ## _CheckDuplicateInFV() method\r
     #\r
     # Check whether there is duplicate modules/files exist in FV section. \r
@@ -953,6 +1040,18 @@ class PlatformAutoGen(AutoGen):
     #  This interface should be invoked explicitly when platform action is created.\r
     #\r
     def CollectPlatformDynamicPcds(self):\r
+        # Override the platform Pcd's value by build option\r
+        if GlobalData.BuildOptionPcd:\r
+            for key in self.Platform.Pcds:\r
+                PlatformPcd = self.Platform.Pcds[key]\r
+                for PcdItem in GlobalData.BuildOptionPcd:\r
+                    if (PlatformPcd.TokenSpaceGuidCName, PlatformPcd.TokenCName) == (PcdItem[0], PcdItem[1]):\r
+                        PlatformPcd.DefaultValue = PcdItem[2]\r
+                        if PlatformPcd.SkuInfoList:\r
+                            Sku = PlatformPcd.SkuInfoList[PlatformPcd.SkuInfoList.keys()[0]]\r
+                            Sku.DefaultValue = PcdItem[2]\r
+                        break\r
+\r
         # for gathering error information\r
         NoDatumTypePcdList = set()\r
         PcdNotInDb = []\r
@@ -1154,8 +1253,18 @@ class PlatformAutoGen(AutoGen):
                                 Alignment = 2\r
                             else:\r
                                 Alignment = 1\r
-                            if int(Sku.VpdOffset) % Alignment != 0:\r
-                                EdkLogger.error("build", FORMAT_INVALID, 'The offset value of PCD %s.%s should be %s-byte aligned.' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Alignment))\r
+                            try:\r
+                                VpdOffset = int(Sku.VpdOffset)\r
+                            except:\r
+                                try:\r
+                                    VpdOffset = int(Sku.VpdOffset, 16)\r
+                                except:\r
+                                    EdkLogger.error("build", FORMAT_INVALID, "Invalid offset value %s for PCD %s.%s." % (Sku.VpdOffset, Pcd.TokenSpaceGuidCName, Pcd.TokenCName))\r
+                            if VpdOffset % Alignment != 0:\r
+                                if PcdValue.startswith("{"):\r
+                                    EdkLogger.warn("build", "The offset value of PCD %s.%s is not 8-byte aligned!" %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName), File=self.MetaFile)\r
+                                else:\r
+                                    EdkLogger.error("build", FORMAT_INVALID, 'The offset value of PCD %s.%s should be %s-byte aligned.' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Alignment))\r
                         VpdFile.Add(Pcd, Sku.VpdOffset)\r
                         # if the offset of a VPD is *, then it need to be fixed up by third party tool.\r
                         if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":\r
@@ -1220,8 +1329,18 @@ class PlatformAutoGen(AutoGen):
                                         Alignment = 2\r
                                     else:\r
                                         Alignment = 1\r
-                                    if int(Sku.VpdOffset) % Alignment != 0:\r
-                                        EdkLogger.error("build", FORMAT_INVALID, 'The offset value of PCD %s.%s should be %s-byte aligned.' % (DscPcdEntry.TokenSpaceGuidCName, DscPcdEntry.TokenCName, Alignment))\r
+                                    try:\r
+                                        VpdOffset = int(Sku.VpdOffset)\r
+                                    except:\r
+                                        try:\r
+                                            VpdOffset = int(Sku.VpdOffset, 16)\r
+                                        except:\r
+                                            EdkLogger.error("build", FORMAT_INVALID, "Invalid offset value %s for PCD %s.%s." % (Sku.VpdOffset, DscPcdEntry.TokenSpaceGuidCName, DscPcdEntry.TokenCName))\r
+                                    if VpdOffset % Alignment != 0:\r
+                                        if PcdValue.startswith("{"):\r
+                                            EdkLogger.warn("build", "The offset value of PCD %s.%s is not 8-byte aligned!" %(DscPcdEntry.TokenSpaceGuidCName, DscPcdEntry.TokenCName), File=self.MetaFile)\r
+                                        else:\r
+                                            EdkLogger.error("build", FORMAT_INVALID, 'The offset value of PCD %s.%s should be %s-byte aligned.' % (DscPcdEntry.TokenSpaceGuidCName, DscPcdEntry.TokenCName, Alignment))\r
                                 VpdFile.Add(DscPcdEntry, Sku.VpdOffset)\r
                                 if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":\r
                                     NeedProcessVpdMapFile = True \r
@@ -1242,7 +1361,6 @@ class PlatformAutoGen(AutoGen):
                                 "Fail to get FLASH_DEFINITION definition in DSC file %s which is required when DSC contains VPD PCD." % str(self.Platform.MetaFile))\r
 \r
             if VpdFile.GetCount() != 0:\r
-                DscTimeStamp = self.Platform.MetaFile.TimeStamp\r
                 FvPath = os.path.join(self.BuildDir, "FV")\r
                 if not os.path.exists(FvPath):\r
                     try:\r
@@ -1250,13 +1368,9 @@ class PlatformAutoGen(AutoGen):
                     except:\r
                         EdkLogger.error("build", FILE_WRITE_FAILURE, "Fail to create FV folder under %s" % self.BuildDir)\r
 \r
-\r
                 VpdFilePath = os.path.join(FvPath, "%s.txt" % self.Platform.VpdToolGuid)\r
 \r
-\r
-                if not os.path.exists(VpdFilePath) or os.path.getmtime(VpdFilePath) < DscTimeStamp:\r
-                    VpdFile.Write(VpdFilePath)\r
-\r
+                if VpdFile.Write(VpdFilePath):\r
                     # retrieve BPDG tool's path from tool_def.txt according to VPD_TOOL_GUID defined in DSC file.\r
                     BPDGToolName = None\r
                     for ToolDef in self.ToolDefinition.values():\r
@@ -2264,6 +2378,7 @@ class ModuleAutoGen(AutoGen):
         self._MakeFileDir     = None\r
 \r
         self._IncludePathList = None\r
+        self._IncludePathLength = 0\r
         self._AutoGenFileList = None\r
         self._UnicodeFileList = None\r
         self._SourceFileList  = None\r
@@ -2363,6 +2478,14 @@ class ModuleAutoGen(AutoGen):
             self._Macro["MODULE_BUILD_DIR"      ] = self.BuildDir\r
             self._Macro["OUTPUT_DIR"            ] = self.OutputDir\r
             self._Macro["DEBUG_DIR"             ] = self.DebugDir\r
+            self._Macro["DEST_DIR_OUTPUT"       ] = self.OutputDir\r
+            self._Macro["DEST_DIR_DEBUG"        ] = self.DebugDir\r
+            self._Macro["PLATFORM_NAME"         ] = self.PlatformInfo.Name\r
+            self._Macro["PLATFORM_GUID"         ] = self.PlatformInfo.Guid\r
+            self._Macro["PLATFORM_VERSION"      ] = self.PlatformInfo.Version\r
+            self._Macro["PLATFORM_RELATIVE_DIR" ] = self.PlatformInfo.SourceDir\r
+            self._Macro["PLATFORM_DIR"          ] = mws.join(self.WorkspaceDir, self.PlatformInfo.SourceDir)\r
+            self._Macro["PLATFORM_OUTPUT_DIR"   ] = self.PlatformInfo.OutputDir\r
         return self._Macro\r
 \r
     ## Return the module build data object\r
@@ -3108,6 +3231,13 @@ class ModuleAutoGen(AutoGen):
                         self._IncludePathList.append(str(Inc))\r
         return self._IncludePathList\r
 \r
+    def _GetIncludePathLength(self):\r
+        self._IncludePathLength = 0\r
+        if self._IncludePathList:\r
+            for inc in self._IncludePathList:\r
+                self._IncludePathLength += len(' ' + inc)\r
+        return self._IncludePathLength\r
+\r
     ## Get HII EX PCDs which maybe used by VFR\r
     #\r
     #  efivarstore used by VFR may relate with HII EX PCDs\r
@@ -3700,6 +3830,7 @@ class ModuleAutoGen(AutoGen):
     CustomMakefile  = property(_GetCustomMakefile)\r
 \r
     IncludePathList = property(_GetIncludePathList)\r
+    IncludePathLength = property(_GetIncludePathLength)\r
     AutoGenFileList = property(_GetAutoGenFileList)\r
     UnicodeFileList = property(_GetUnicodeFileList)\r
     SourceFileList  = property(_GetSourceFileList)\r