Sync BaseTools Trunk (version r2518) to EDKII main trunk.

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / AutoGen.py

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 894ec8dcd8e3bc23ed348cb6b8a12811170f6e6e..2f38c6afd5537c61e328cda689d5001927775565 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -46,6 +46,9 @@ gMakeTypeMap = {"MSFT":"nmake", "GCC":"gmake"}
 ## Build rule configuration file\r
 gBuildRuleFile = 'Conf/build_rule.txt'\r
 \r
+## Build rule default version\r
+AutoGenReqBuildRuleVerNum = "0.1"\r
+\r
 ## default file name for AutoGen\r
 gAutoGenCodeFileName = "AutoGen.c"\r
 gAutoGenHeaderFileName = "AutoGen.h"\r
@@ -288,8 +291,25 @@ class WorkspaceAutoGen(AutoGen):
         # apply SKU and inject PCDs from Flash Definition file\r
         for Arch in self.ArchList:\r
             Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]\r
+\r
+            DecPcds = set()\r
+            PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)\r
+            Pkgs = PGen.PackageList\r
+            for Pkg in Pkgs:\r
+                for Pcd in Pkg.Pcds.keys():\r
+                    DecPcds.add((Pcd[0], Pcd[1]))\r
+            Platform.IsPlatformPcdDeclared(DecPcds)\r
+\r
             Platform.SkuName = self.SkuId\r
             for Name, Guid in PcdSet:\r
+                if (Name, Guid) not in DecPcds:\r
+                    EdkLogger.error(\r
+                        'build',\r
+                        PARSER_ERROR,\r
+                        "PCD (%s.%s) used in FDF is not declared in DEC files." % (Guid, Name),\r
+                        File = self.FdfProfile.PcdFileLineDict[Name, Guid][0],\r
+                        Line = self.FdfProfile.PcdFileLineDict[Name, Guid][1]\r
+                    )\r
                 Platform.AddPcd(Name, Guid, PcdSet[Name, Guid])\r
 \r
             Pa = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)\r
@@ -334,11 +354,14 @@ class WorkspaceAutoGen(AutoGen):
                     #\r
                     InfFoundFlag = False                   \r
                     for Pa in self.AutoGenObjectList:\r
+                        if InfFoundFlag:\r
+                            break\r
                         for Module in Pa.ModuleAutoGenList:\r
                             if path.normpath(Module.MetaFile.File) == path.normpath(FfsFile.InfFileName):\r
                                 InfFoundFlag = True\r
                                 if not Module.Guid.upper() in _GuidDict.keys():\r
                                     _GuidDict[Module.Guid.upper()] = FfsFile\r
+                                    break\r
                                 else:\r
                                     EdkLogger.error("build", \r
                                                     FORMAT_INVALID,\r
@@ -1230,6 +1253,15 @@ class PlatformAutoGen(AutoGen):
             if BuildRuleFile in [None, '']:\r
                 BuildRuleFile = gBuildRuleFile\r
             self._BuildRule = BuildRule(BuildRuleFile)\r
+            if self._BuildRule._FileVersion == "":\r
+                self._BuildRule._FileVersion = AutoGenReqBuildRuleVerNum\r
+            else:\r
+                if self._BuildRule._FileVersion < AutoGenReqBuildRuleVerNum :\r
+                    # If Build Rule's version is less than the version number required by the tools, halting the build.\r
+                    EdkLogger.error("build", AUTOGEN_ERROR, \r
+                                    ExtraData="The version number [%s] of build_rule.txt is less than the version number required by the AutoGen.(the minimum required version number is [%s])"\\r
+                                     % (self._BuildRule._FileVersion, AutoGenReqBuildRuleVerNum))\r
+              \r
         return self._BuildRule\r
 \r
     ## Summarize the packages used by modules in this platform\r