]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: Refactor PlatformAutoGen
authorCarsey, Jaben <jaben.carsey@intel.com>
Mon, 10 Sep 2018 22:18:01 +0000 (06:18 +0800)
committerYonghong Zhu <yonghong.zhu@intel.com>
Thu, 20 Sep 2018 14:18:05 +0000 (22:18 +0800)
use decorators for property and automatic caching
remove circular dependency between some APIs

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Bob Feng <Bob.c.Feng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
BaseTools/Source/Python/AutoGen/AutoGen.py

index 4ce04894468a83598a3834675db23ea296162c6b..cef5aeaf3ecb631fdef4a44a4fa4b50621de7249 100644 (file)
@@ -1046,41 +1046,13 @@ class PlatformAutoGen(AutoGen):
         # get the original module/package/platform objects\r
         self.BuildDatabase = Workspace.BuildDatabase\r
         self.DscBuildDataObj = Workspace.Platform\r
-        self._GuidDict = Workspace._GuidDict\r
 \r
         # flag indicating if the makefile/C-code file has been created or not\r
         self.IsMakeFileCreated  = False\r
-        self.IsCodeFileCreated  = False\r
-\r
-        self._Platform   = None\r
-        self._Name       = None\r
-        self._Guid       = None\r
-        self._Version    = None\r
-\r
-        self._BuildRule = None\r
-        self._SourceDir = None\r
-        self._BuildDir = None\r
-        self._OutputDir = None\r
-        self._FvDir = None\r
-        self._MakeFileDir = None\r
-        self._FdfFile = None\r
-\r
-        self._PcdTokenNumber = None    # (TokenCName, TokenSpaceGuidCName) : GeneratedTokenNumber\r
+\r
         self._DynamicPcdList = None    # [(TokenCName1, TokenSpaceGuidCName1), (TokenCName2, TokenSpaceGuidCName2), ...]\r
         self._NonDynamicPcdList = None # [(TokenCName1, TokenSpaceGuidCName1), (TokenCName2, TokenSpaceGuidCName2), ...]\r
-        self._NonDynamicPcdDict = {}\r
-\r
-        self._ToolDefinitions = None\r
-        self._ToolDefFile = None          # toolcode : tool path\r
-        self._ToolChainFamily = None\r
-        self._BuildRuleFamily = None\r
-        self._BuildOption = None          # toolcode : option\r
-        self._EdkBuildOption = None       # edktoolcode : option\r
-        self._EdkIIBuildOption = None     # edkiitoolcode : option\r
-        self._PackageList = None\r
-        self._ModuleAutoGenList  = None\r
-        self._LibraryAutoGenList = None\r
-        self._BuildCommand = None\r
+\r
         self._AsBuildInfList = []\r
         self._AsBuildModuleList = []\r
 \r
@@ -1100,6 +1072,7 @@ class PlatformAutoGen(AutoGen):
 \r
         return True\r
 \r
+    @cached_class_function\r
     def __repr__(self):\r
         return "%s [%s]" % (self.MetaFile, self.Arch)\r
 \r
@@ -1111,19 +1084,18 @@ class PlatformAutoGen(AutoGen):
     #   @param      CreateModuleCodeFile    Flag indicating if creating module's\r
     #                                       autogen code file or not\r
     #\r
+    @cached_class_function\r
     def CreateCodeFile(self, CreateModuleCodeFile=False):\r
         # only module has code to be greated, so do nothing if CreateModuleCodeFile is False\r
-        if self.IsCodeFileCreated or not CreateModuleCodeFile:\r
+        if not CreateModuleCodeFile:\r
             return\r
 \r
         for Ma in self.ModuleAutoGenList:\r
             Ma.CreateCodeFile(True)\r
 \r
-        # don't do this twice\r
-        self.IsCodeFileCreated = True\r
-\r
     ## Generate Fds Command\r
-    def _GenFdsCommand(self):\r
+    @cached_property\r
+    def GenFdsCommand(self):\r
         return self.Workspace.GenFdsCommand\r
 \r
     ## Create makefile for the platform and mdoules in it\r
@@ -1185,7 +1157,6 @@ class PlatformAutoGen(AutoGen):
                     LibAuto.ConstPcd[key] = FixedAtBuildPcds[key]\r
 \r
     def CollectVariables(self, DynamicPcdSet):\r
-\r
         VpdRegionSize = 0\r
         VpdRegionBase = 0\r
         if self.Workspace.FdfFile:\r
@@ -1197,7 +1168,6 @@ class PlatformAutoGen(AutoGen):
                         VpdRegionBase = FdRegion.Offset\r
                         break\r
 \r
-\r
         VariableInfo = VariableMgr(self.DscBuildDataObj._GetDefaultStores(), self.DscBuildDataObj._GetSkuIds())\r
         VariableInfo.SetVpdRegionMaxSize(VpdRegionSize)\r
         VariableInfo.SetVpdRegionOffset(VpdRegionBase)\r
@@ -1250,7 +1220,6 @@ class PlatformAutoGen(AutoGen):
     #  This interface should be invoked explicitly when platform action is created.\r
     #\r
     def CollectPlatformDynamicPcds(self):\r
-\r
         for key in self.Platform.Pcds:\r
             for SinglePcd in GlobalData.MixedPcd:\r
                 if (self.Platform.Pcds[key].TokenCName, self.Platform.Pcds[key].TokenSpaceGuidCName) == SinglePcd:\r
@@ -1687,308 +1656,318 @@ class PlatformAutoGen(AutoGen):
                 EdkLogger.error("Build", FILE_NOT_FOUND, "Fail to find third-party BPDG tool to process VPD PCDs. BPDG Guid tool need to be defined in tools_def.txt and VPD_TOOL_GUID need to be provided in DSC file.")\r
 \r
     ## Return the platform build data object\r
-    def _GetPlatform(self):\r
-        if self._Platform is None:\r
-            self._Platform = self.BuildDatabase[self.MetaFile, self.Arch, self.BuildTarget, self.ToolChain]\r
-        return self._Platform\r
+    @cached_property\r
+    def Platform(self):\r
+        return self.BuildDatabase[self.MetaFile, self.Arch, self.BuildTarget, self.ToolChain]\r
 \r
     ## Return platform name\r
-    def _GetName(self):\r
+    @cached_property\r
+    def Name(self):\r
         return self.Platform.PlatformName\r
 \r
     ## Return the meta file GUID\r
-    def _GetGuid(self):\r
+    @cached_property\r
+    def Guid(self):\r
         return self.Platform.Guid\r
 \r
     ## Return the platform version\r
-    def _GetVersion(self):\r
+    @cached_property\r
+    def Version(self):\r
         return self.Platform.Version\r
 \r
     ## Return the FDF file name\r
-    def _GetFdfFile(self):\r
-        if self._FdfFile is None:\r
-            if self.Workspace.FdfFile != "":\r
-                self._FdfFile= mws.join(self.WorkspaceDir, self.Workspace.FdfFile)\r
-            else:\r
-                self._FdfFile = ''\r
-        return self._FdfFile\r
+    @cached_property\r
+    def FdfFile(self):\r
+        if self.Workspace.FdfFile:\r
+            RetVal= mws.join(self.WorkspaceDir, self.Workspace.FdfFile)\r
+        else:\r
+            RetVal = ''\r
+        return RetVal\r
 \r
     ## Return the build output directory platform specifies\r
-    def _GetOutputDir(self):\r
+    @cached_property\r
+    def OutputDir(self):\r
         return self.Platform.OutputDirectory\r
 \r
     ## Return the directory to store all intermediate and final files built\r
-    def _GetBuildDir(self):\r
-        if self._BuildDir is None:\r
-            if os.path.isabs(self.OutputDir):\r
-                self._BuildDir = path.join(\r
-                                            path.abspath(self.OutputDir),\r
-                                            self.BuildTarget + "_" + self.ToolChain,\r
-                                            )\r
-            else:\r
-                self._BuildDir = path.join(\r
-                                            self.WorkspaceDir,\r
-                                            self.OutputDir,\r
-                                            self.BuildTarget + "_" + self.ToolChain,\r
-                                            )\r
-            GlobalData.gBuildDirectory = self._BuildDir\r
-        return self._BuildDir\r
+    @cached_property\r
+    def BuildDir(self):\r
+        if os.path.isabs(self.OutputDir):\r
+            GlobalData.gBuildDirectory = RetVal = path.join(\r
+                                        path.abspath(self.OutputDir),\r
+                                        self.BuildTarget + "_" + self.ToolChain,\r
+                                        )\r
+        else:\r
+            GlobalData.gBuildDirectory = RetVal = path.join(\r
+                                        self.WorkspaceDir,\r
+                                        self.OutputDir,\r
+                                        self.BuildTarget + "_" + self.ToolChain,\r
+                                        )\r
+        return RetVal\r
 \r
     ## Return directory of platform makefile\r
     #\r
     #   @retval     string  Makefile directory\r
     #\r
-    def _GetMakeFileDir(self):\r
-        if self._MakeFileDir is None:\r
-            self._MakeFileDir = path.join(self.BuildDir, self.Arch)\r
-        return self._MakeFileDir\r
+    @cached_property\r
+    def MakeFileDir(self):\r
+        return path.join(self.BuildDir, self.Arch)\r
 \r
     ## Return build command string\r
     #\r
     #   @retval     string  Build command string\r
     #\r
-    def _GetBuildCommand(self):\r
-        if self._BuildCommand is None:\r
-            self._BuildCommand = []\r
-            if "MAKE" in self.ToolDefinition and "PATH" in self.ToolDefinition["MAKE"]:\r
-                self._BuildCommand += SplitOption(self.ToolDefinition["MAKE"]["PATH"])\r
-                if "FLAGS" in self.ToolDefinition["MAKE"]:\r
-                    NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip()\r
-                    if NewOption != '':\r
-                        self._BuildCommand += SplitOption(NewOption)\r
-                if "MAKE" in self.EdkIIBuildOption:\r
-                    if "FLAGS" in self.EdkIIBuildOption["MAKE"]:\r
-                        Flags = self.EdkIIBuildOption["MAKE"]["FLAGS"]\r
-                        if Flags.startswith('='):\r
-                            self._BuildCommand = [self._BuildCommand[0]] + [Flags[1:]]\r
-                        else:\r
-                            self._BuildCommand.append(Flags)\r
-        return self._BuildCommand\r
+    @cached_property\r
+    def BuildCommand(self):\r
+        RetVal = []\r
+        if "MAKE" in self.ToolDefinition and "PATH" in self.ToolDefinition["MAKE"]:\r
+            RetVal += SplitOption(self.ToolDefinition["MAKE"]["PATH"])\r
+            if "FLAGS" in self.ToolDefinition["MAKE"]:\r
+                NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip()\r
+                if NewOption != '':\r
+                    RetVal += SplitOption(NewOption)\r
+            if "MAKE" in self.EdkIIBuildOption:\r
+                if "FLAGS" in self.EdkIIBuildOption["MAKE"]:\r
+                    Flags = self.EdkIIBuildOption["MAKE"]["FLAGS"]\r
+                    if Flags.startswith('='):\r
+                        RetVal = [RetVal[0]] + [Flags[1:]]\r
+                    else:\r
+                        RetVal.append(Flags)\r
+        return RetVal\r
 \r
     ## Get tool chain definition\r
     #\r
     #  Get each tool defition for given tool chain from tools_def.txt and platform\r
     #\r
-    def _GetToolDefinition(self):\r
-        if self._ToolDefinitions is None:\r
-            ToolDefinition = self.Workspace.ToolDef.ToolsDefTxtDictionary\r
-            if TAB_TOD_DEFINES_COMMAND_TYPE not in self.Workspace.ToolDef.ToolsDefTxtDatabase:\r
-                EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, "No tools found in configuration",\r
-                                ExtraData="[%s]" % self.MetaFile)\r
-            self._ToolDefinitions = {}\r
-            DllPathList = set()\r
-            for Def in ToolDefinition:\r
-                Target, Tag, Arch, Tool, Attr = Def.split("_")\r
-                if Target != self.BuildTarget or Tag != self.ToolChain or Arch != self.Arch:\r
-                    continue\r
+    @cached_property\r
+    def ToolDefinition(self):\r
+        ToolDefinition = self.Workspace.ToolDef.ToolsDefTxtDictionary\r
+        if TAB_TOD_DEFINES_COMMAND_TYPE not in self.Workspace.ToolDef.ToolsDefTxtDatabase:\r
+            EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, "No tools found in configuration",\r
+                            ExtraData="[%s]" % self.MetaFile)\r
+        RetVal = {}\r
+        DllPathList = set()\r
+        for Def in ToolDefinition:\r
+            Target, Tag, Arch, Tool, Attr = Def.split("_")\r
+            if Target != self.BuildTarget or Tag != self.ToolChain or Arch != self.Arch:\r
+                continue\r
 \r
-                Value = ToolDefinition[Def]\r
-                # don't record the DLL\r
-                if Attr == "DLL":\r
-                    DllPathList.add(Value)\r
-                    continue\r
+            Value = ToolDefinition[Def]\r
+            # don't record the DLL\r
+            if Attr == "DLL":\r
+                DllPathList.add(Value)\r
+                continue\r
 \r
-                if Tool not in self._ToolDefinitions:\r
-                    self._ToolDefinitions[Tool] = {}\r
-                self._ToolDefinitions[Tool][Attr] = Value\r
-\r
-            ToolsDef = ''\r
-            if GlobalData.gOptions.SilentMode and "MAKE" in self._ToolDefinitions:\r
-                if "FLAGS" not in self._ToolDefinitions["MAKE"]:\r
-                    self._ToolDefinitions["MAKE"]["FLAGS"] = ""\r
-                self._ToolDefinitions["MAKE"]["FLAGS"] += " -s"\r
-            MakeFlags = ''\r
-            for Tool in self._ToolDefinitions:\r
-                for Attr in self._ToolDefinitions[Tool]:\r
-                    Value = self._ToolDefinitions[Tool][Attr]\r
-                    if Tool in self.BuildOption and Attr in self.BuildOption[Tool]:\r
-                        # check if override is indicated\r
-                        if self.BuildOption[Tool][Attr].startswith('='):\r
-                            Value = self.BuildOption[Tool][Attr][1:]\r
-                        else:\r
-                            if Attr != 'PATH':\r
-                                Value += " " + self.BuildOption[Tool][Attr]\r
-                            else:\r
-                                Value = self.BuildOption[Tool][Attr]\r
-\r
-                    if Attr == "PATH":\r
-                        # Don't put MAKE definition in the file\r
-                        if Tool != "MAKE":\r
-                            ToolsDef += "%s = %s\n" % (Tool, Value)\r
-                    elif Attr != "DLL":\r
-                        # Don't put MAKE definition in the file\r
-                        if Tool == "MAKE":\r
-                            if Attr == "FLAGS":\r
-                                MakeFlags = Value\r
+            if Tool not in RetVal:\r
+                RetVal[Tool] = {}\r
+            RetVal[Tool][Attr] = Value\r
+\r
+        ToolsDef = ''\r
+        if GlobalData.gOptions.SilentMode and "MAKE" in RetVal:\r
+            if "FLAGS" not in RetVal["MAKE"]:\r
+                RetVal["MAKE"]["FLAGS"] = ""\r
+            RetVal["MAKE"]["FLAGS"] += " -s"\r
+        MakeFlags = ''\r
+        for Tool in RetVal:\r
+            for Attr in RetVal[Tool]:\r
+                Value = RetVal[Tool][Attr]\r
+                if Tool in self._BuildOptionWithToolDef(RetVal) and Attr in self._BuildOptionWithToolDef(RetVal)[Tool]:\r
+                    # check if override is indicated\r
+                    if self._BuildOptionWithToolDef(RetVal)[Tool][Attr].startswith('='):\r
+                        Value = self._BuildOptionWithToolDef(RetVal)[Tool][Attr][1:]\r
+                    else:\r
+                        if Attr != 'PATH':\r
+                            Value += " " + self._BuildOptionWithToolDef(RetVal)[Tool][Attr]\r
                         else:\r
-                            ToolsDef += "%s_%s = %s\n" % (Tool, Attr, Value)\r
-                ToolsDef += "\n"\r
+                            Value = self._BuildOptionWithToolDef(RetVal)[Tool][Attr]\r
+\r
+                if Attr == "PATH":\r
+                    # Don't put MAKE definition in the file\r
+                    if Tool != "MAKE":\r
+                        ToolsDef += "%s = %s\n" % (Tool, Value)\r
+                elif Attr != "DLL":\r
+                    # Don't put MAKE definition in the file\r
+                    if Tool == "MAKE":\r
+                        if Attr == "FLAGS":\r
+                            MakeFlags = Value\r
+                    else:\r
+                        ToolsDef += "%s_%s = %s\n" % (Tool, Attr, Value)\r
+            ToolsDef += "\n"\r
 \r
-            SaveFileOnChange(self.ToolDefinitionFile, ToolsDef)\r
-            for DllPath in DllPathList:\r
-                os.environ["PATH"] = DllPath + os.pathsep + os.environ["PATH"]\r
-            os.environ["MAKE_FLAGS"] = MakeFlags\r
+        SaveFileOnChange(self.ToolDefinitionFile, ToolsDef)\r
+        for DllPath in DllPathList:\r
+            os.environ["PATH"] = DllPath + os.pathsep + os.environ["PATH"]\r
+        os.environ["MAKE_FLAGS"] = MakeFlags\r
 \r
-        return self._ToolDefinitions\r
+        return RetVal\r
 \r
     ## Return the paths of tools\r
-    def _GetToolDefFile(self):\r
-        if self._ToolDefFile is None:\r
-            self._ToolDefFile = os.path.join(self.MakeFileDir, "TOOLS_DEF." + self.Arch)\r
-        return self._ToolDefFile\r
+    @cached_property\r
+    def ToolDefinitionFile(self):\r
+        return os.path.join(self.MakeFileDir, "TOOLS_DEF." + self.Arch)\r
 \r
     ## Retrieve the toolchain family of given toolchain tag. Default to 'MSFT'.\r
-    def _GetToolChainFamily(self):\r
-        if self._ToolChainFamily is None:\r
-            ToolDefinition = self.Workspace.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
-                EdkLogger.verbose("No tool chain family found in configuration for %s. Default to MSFT." \\r
-                                   % self.ToolChain)\r
-                self._ToolChainFamily = TAB_COMPILER_MSFT\r
-            else:\r
-                self._ToolChainFamily = ToolDefinition[TAB_TOD_DEFINES_FAMILY][self.ToolChain]\r
-        return self._ToolChainFamily\r
-\r
-    def _GetBuildRuleFamily(self):\r
-        if self._BuildRuleFamily is None:\r
-            ToolDefinition = self.Workspace.ToolDef.ToolsDefTxtDatabase\r
-            if TAB_TOD_DEFINES_BUILDRULEFAMILY not in ToolDefinition \\r
-               or self.ToolChain not in ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY] \\r
-               or not ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY][self.ToolChain]:\r
-                EdkLogger.verbose("No tool chain family found in configuration for %s. Default to MSFT." \\r
-                                   % self.ToolChain)\r
-                self._BuildRuleFamily = TAB_COMPILER_MSFT\r
-            else:\r
-                self._BuildRuleFamily = ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY][self.ToolChain]\r
-        return self._BuildRuleFamily\r
+    @cached_property\r
+    def ToolChainFamily(self):\r
+        ToolDefinition = self.Workspace.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
+            EdkLogger.verbose("No tool chain family found in configuration for %s. Default to MSFT." \\r
+                               % self.ToolChain)\r
+            RetVal = TAB_COMPILER_MSFT\r
+        else:\r
+            RetVal = ToolDefinition[TAB_TOD_DEFINES_FAMILY][self.ToolChain]\r
+        return RetVal\r
+\r
+    @cached_property\r
+    def BuildRuleFamily(self):\r
+        ToolDefinition = self.Workspace.ToolDef.ToolsDefTxtDatabase\r
+        if TAB_TOD_DEFINES_BUILDRULEFAMILY not in ToolDefinition \\r
+           or self.ToolChain not in ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY] \\r
+           or not ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY][self.ToolChain]:\r
+            EdkLogger.verbose("No tool chain family found in configuration for %s. Default to MSFT." \\r
+                               % self.ToolChain)\r
+            return TAB_COMPILER_MSFT\r
+\r
+        return ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY][self.ToolChain]\r
 \r
     ## Return the build options specific for all modules in this platform\r
-    def _GetBuildOptions(self):\r
-        if self._BuildOption is None:\r
-            self._BuildOption = self._ExpandBuildOption(self.Platform.BuildOptions)\r
-        return self._BuildOption\r
+    @cached_property\r
+    def BuildOption(self):\r
+        return self._ExpandBuildOption(self.Platform.BuildOptions)\r
+\r
+    def _BuildOptionWithToolDef(self, ToolDef):\r
+        return self._ExpandBuildOption(self.Platform.BuildOptions, ToolDef=ToolDef)\r
 \r
     ## Return the build options specific for EDK modules in this platform\r
-    def _GetEdkBuildOptions(self):\r
-        if self._EdkBuildOption is None:\r
-            self._EdkBuildOption = self._ExpandBuildOption(self.Platform.BuildOptions, EDK_NAME)\r
-        return self._EdkBuildOption\r
+    @cached_property\r
+    def EdkBuildOption(self):\r
+        return self._ExpandBuildOption(self.Platform.BuildOptions, EDK_NAME)\r
 \r
     ## Return the build options specific for EDKII modules in this platform\r
-    def _GetEdkIIBuildOptions(self):\r
-        if self._EdkIIBuildOption is None:\r
-            self._EdkIIBuildOption = self._ExpandBuildOption(self.Platform.BuildOptions, EDKII_NAME)\r
-        return self._EdkIIBuildOption\r
+    @cached_property\r
+    def EdkIIBuildOption(self):\r
+        return self._ExpandBuildOption(self.Platform.BuildOptions, EDKII_NAME)\r
 \r
     ## Parse build_rule.txt in Conf Directory.\r
     #\r
     #   @retval     BuildRule object\r
     #\r
-    def _GetBuildRule(self):\r
-        if self._BuildRule is None:\r
-            BuildRuleFile = None\r
-            if TAB_TAT_DEFINES_BUILD_RULE_CONF in self.Workspace.TargetTxt.TargetTxtDictionary:\r
-                BuildRuleFile = self.Workspace.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_BUILD_RULE_CONF]\r
-            if not BuildRuleFile:\r
-                BuildRuleFile = gDefaultBuildRuleFile\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
+    @cached_property\r
+    def BuildRule(self):\r
+        BuildRuleFile = None\r
+        if TAB_TAT_DEFINES_BUILD_RULE_CONF in self.Workspace.TargetTxt.TargetTxtDictionary:\r
+            BuildRuleFile = self.Workspace.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_BUILD_RULE_CONF]\r
+        if not BuildRuleFile:\r
+            BuildRuleFile = gDefaultBuildRuleFile\r
+        RetVal = BuildRule(BuildRuleFile)\r
+        if RetVal._FileVersion == "":\r
+            RetVal._FileVersion = AutoGenReqBuildRuleVerNum\r
+        else:\r
+            if RetVal._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
+                                 % (RetVal._FileVersion, AutoGenReqBuildRuleVerNum))\r
+        return RetVal\r
 \r
     ## Summarize the packages used by modules in this platform\r
-    def _GetPackageList(self):\r
-        if self._PackageList is None:\r
-            self._PackageList = set()\r
-            for La in self.LibraryAutoGenList:\r
-                self._PackageList.update(La.DependentPackageList)\r
-            for Ma in self.ModuleAutoGenList:\r
-                self._PackageList.update(Ma.DependentPackageList)\r
-            #Collect package set information from INF of FDF\r
-            PkgSet = set()\r
-            for ModuleFile in self._AsBuildModuleList:\r
-                if ModuleFile in self.Platform.Modules:\r
-                    continue\r
-                ModuleData = self.BuildDatabase[ModuleFile, self.Arch, self.BuildTarget, self.ToolChain]\r
-                PkgSet.update(ModuleData.Packages)\r
-            self._PackageList = list(self._PackageList) + list (PkgSet)\r
-        return self._PackageList\r
+    @cached_property\r
+    def PackageList(self):\r
+        RetVal = set()\r
+        for La in self.LibraryAutoGenList:\r
+            RetVal.update(La.DependentPackageList)\r
+        for Ma in self.ModuleAutoGenList:\r
+            RetVal.update(Ma.DependentPackageList)\r
+        #Collect package set information from INF of FDF\r
+        for ModuleFile in self._AsBuildModuleList:\r
+            if ModuleFile in self.Platform.Modules:\r
+                continue\r
+            ModuleData = self.BuildDatabase[ModuleFile, self.Arch, self.BuildTarget, self.ToolChain]\r
+            RetVal.update(ModuleData.Packages)\r
+        return list(RetVal)\r
 \r
-    def _GetNonDynamicPcdDict(self):\r
-        if self._NonDynamicPcdDict:\r
-            return self._NonDynamicPcdDict\r
-        for Pcd in self.NonDynamicPcdList:\r
-            self._NonDynamicPcdDict[(Pcd.TokenCName, Pcd.TokenSpaceGuidCName)] = Pcd\r
-        return self._NonDynamicPcdDict\r
+    @cached_property\r
+    def NonDynamicPcdDict(self):\r
+        return {(Pcd.TokenCName, Pcd.TokenSpaceGuidCName):Pcd for Pcd in self.NonDynamicPcdList}\r
 \r
     ## Get list of non-dynamic PCDs\r
-    def _GetNonDynamicPcdList(self):\r
-        if self._NonDynamicPcdList is None:\r
-            self.CollectPlatformDynamicPcds()\r
+    @cached_property\r
+    def NonDynamicPcdList(self):\r
+        self.CollectPlatformDynamicPcds()\r
         return self._NonDynamicPcdList\r
 \r
     ## Get list of dynamic PCDs\r
-    def _GetDynamicPcdList(self):\r
-        if self._DynamicPcdList is None:\r
-            self.CollectPlatformDynamicPcds()\r
+    @cached_property\r
+    def DynamicPcdList(self):\r
+        self.CollectPlatformDynamicPcds()\r
         return self._DynamicPcdList\r
 \r
     ## Generate Token Number for all PCD\r
-    def _GetPcdTokenNumbers(self):\r
-        if self._PcdTokenNumber is None:\r
-            self._PcdTokenNumber = OrderedDict()\r
-            TokenNumber = 1\r
-            #\r
-            # Make the Dynamic and DynamicEx PCD use within different TokenNumber area.\r
-            # Such as:\r
-            #\r
-            # Dynamic PCD:\r
-            # TokenNumber 0 ~ 10\r
-            # DynamicEx PCD:\r
-            # TokeNumber 11 ~ 20\r
-            #\r
-            for Pcd in self.DynamicPcdList:\r
-                if Pcd.Phase == "PEI" and Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
-                    EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
-                    self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
-                    TokenNumber += 1\r
-\r
-            for Pcd in self.DynamicPcdList:\r
-                if Pcd.Phase == "PEI" and Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
-                    EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
-                    self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
-                    TokenNumber += 1\r
-\r
-            for Pcd in self.DynamicPcdList:\r
-                if Pcd.Phase == "DXE" and Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
-                    EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
-                    self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
-                    TokenNumber += 1\r
-\r
-            for Pcd in self.DynamicPcdList:\r
-                if Pcd.Phase == "DXE" and Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
-                    EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
-                    self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
-                    TokenNumber += 1\r
-\r
-            for Pcd in self.NonDynamicPcdList:\r
-                self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
+    @cached_property\r
+    def PcdTokenNumber(self):\r
+        RetVal = OrderedDict()\r
+        TokenNumber = 1\r
+        #\r
+        # Make the Dynamic and DynamicEx PCD use within different TokenNumber area.\r
+        # Such as:\r
+        #\r
+        # Dynamic PCD:\r
+        # TokenNumber 0 ~ 10\r
+        # DynamicEx PCD:\r
+        # TokeNumber 11 ~ 20\r
+        #\r
+        for Pcd in self.DynamicPcdList:\r
+            if Pcd.Phase == "PEI" and Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
+                EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
+                RetVal[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
+                TokenNumber += 1\r
+\r
+        for Pcd in self.DynamicPcdList:\r
+            if Pcd.Phase == "PEI" and Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
+                EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
+                RetVal[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
+                TokenNumber += 1\r
+\r
+        for Pcd in self.DynamicPcdList:\r
+            if Pcd.Phase == "DXE" and Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
+                EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
+                RetVal[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
+                TokenNumber += 1\r
+\r
+        for Pcd in self.DynamicPcdList:\r
+            if Pcd.Phase == "DXE" and Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
+                EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
+                RetVal[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
                 TokenNumber += 1\r
-        return self._PcdTokenNumber\r
 \r
-    ## Summarize ModuleAutoGen objects of all modules/libraries to be built for this platform\r
-    def _GetAutoGenObjectList(self):\r
-        self._ModuleAutoGenList = []\r
-        self._LibraryAutoGenList = []\r
+        for Pcd in self.NonDynamicPcdList:\r
+            RetVal[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
+            TokenNumber += 1\r
+        return RetVal\r
+\r
+    ## Summarize ModuleAutoGen objects of all modules to be built for this platform\r
+    @cached_property\r
+    def ModuleAutoGenList(self):\r
+        RetVal = []\r
+        for ModuleFile in self.Platform.Modules:\r
+            Ma = ModuleAutoGen(\r
+                    self.Workspace,\r
+                    ModuleFile,\r
+                    self.BuildTarget,\r
+                    self.ToolChain,\r
+                    self.Arch,\r
+                    self.MetaFile\r
+                    )\r
+            if Ma not in RetVal:\r
+                RetVal.append(Ma)\r
+        return RetVal\r
+\r
+    ## Summarize ModuleAutoGen objects of all libraries to be built for this platform\r
+    @cached_property\r
+    def LibraryAutoGenList(self):\r
+        RetVal = []\r
         for ModuleFile in self.Platform.Modules:\r
             Ma = ModuleAutoGen(\r
                     self.Workspace,\r
@@ -1998,25 +1977,12 @@ class PlatformAutoGen(AutoGen):
                     self.Arch,\r
                     self.MetaFile\r
                     )\r
-            if Ma not in self._ModuleAutoGenList:\r
-                self._ModuleAutoGenList.append(Ma)\r
             for La in Ma.LibraryAutoGenList:\r
-                if La not in self._LibraryAutoGenList:\r
-                    self._LibraryAutoGenList.append(La)\r
+                if La not in RetVal:\r
+                    RetVal.append(La)\r
                 if Ma not in La.ReferenceModules:\r
                     La.ReferenceModules.append(Ma)\r
-\r
-    ## Summarize ModuleAutoGen objects of all modules to be built for this platform\r
-    def _GetModuleAutoGenList(self):\r
-        if self._ModuleAutoGenList is None:\r
-            self._GetAutoGenObjectList()\r
-        return self._ModuleAutoGenList\r
-\r
-    ## Summarize ModuleAutoGen objects of all libraries to be built for this platform\r
-    def _GetLibraryAutoGenList(self):\r
-        if self._LibraryAutoGenList is None:\r
-            self._GetAutoGenObjectList()\r
-        return self._LibraryAutoGenList\r
+        return RetVal\r
 \r
     ## Test if a module is supported by the platform\r
     #\r
@@ -2099,7 +2065,7 @@ class PlatformAutoGen(AutoGen):
             # Add Flexible PCD format parse\r
             if ToPcd.DefaultValue:\r
                 try:\r
-                    ToPcd.DefaultValue = ValueExpressionEx(ToPcd.DefaultValue, ToPcd.DatumType, self._GuidDict)(True)\r
+                    ToPcd.DefaultValue = ValueExpressionEx(ToPcd.DefaultValue, ToPcd.DatumType, self.Workspace._GuidDict)(True)\r
                 except BadExpression as Value:\r
                     EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(ToPcd.TokenSpaceGuidCName, ToPcd.TokenCName, ToPcd.DefaultValue, Value),\r
                                         File=self.MetaFile)\r
@@ -2265,10 +2231,16 @@ class PlatformAutoGen(AutoGen):
     ## Expand * in build option key\r
     #\r
     #   @param  Options     Options to be expanded\r
+    #   @param  ToolDef     Use specified ToolDef instead of full version.\r
+    #                       This is needed during initialization to prevent\r
+    #                       infinite recursion betweeh BuildOptions,\r
+    #                       ToolDefinition, and this function.\r
     #\r
     #   @retval options     Options expanded\r
     #\r
-    def _ExpandBuildOption(self, Options, ModuleStyle=None):\r
+    def _ExpandBuildOption(self, Options, ModuleStyle=None, ToolDef=None):\r
+        if not ToolDef:\r
+            ToolDef = self.ToolDefinition\r
         BuildOptions = {}\r
         FamilyMatch  = False\r
         FamilyIsNull = True\r
@@ -2332,12 +2304,12 @@ class PlatformAutoGen(AutoGen):
             Family = Key[0]\r
             Target, Tag, Arch, Tool, Attr = Key[1].split("_")\r
             # if tool chain family doesn't match, skip it\r
-            if Tool in self.ToolDefinition and Family != "":\r
+            if Tool in ToolDef and Family != "":\r
                 FamilyIsNull = False\r
-                if self.ToolDefinition[Tool].get(TAB_TOD_DEFINES_BUILDRULEFAMILY, "") != "":\r
-                    if Family != self.ToolDefinition[Tool][TAB_TOD_DEFINES_BUILDRULEFAMILY]:\r
+                if ToolDef[Tool].get(TAB_TOD_DEFINES_BUILDRULEFAMILY, "") != "":\r
+                    if Family != ToolDef[Tool][TAB_TOD_DEFINES_BUILDRULEFAMILY]:\r
                         continue\r
-                elif Family != self.ToolDefinition[Tool][TAB_TOD_DEFINES_FAMILY]:\r
+                elif Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]:\r
                     continue\r
                 FamilyMatch = True\r
             # expand any wildcard\r
@@ -2369,10 +2341,10 @@ class PlatformAutoGen(AutoGen):
             Family = Key[0]\r
             Target, Tag, Arch, Tool, Attr = Key[1].split("_")\r
             # if tool chain family doesn't match, skip it\r
-            if Tool not in self.ToolDefinition or Family == "":\r
+            if Tool not in ToolDef or Family == "":\r
                 continue\r
             # option has been added before\r
-            if Family != self.ToolDefinition[Tool][TAB_TOD_DEFINES_FAMILY]:\r
+            if Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]:\r
                 continue\r
 \r
             # expand any wildcard\r
@@ -2451,36 +2423,6 @@ class PlatformAutoGen(AutoGen):
             BuildOptions['BUILD']['FLAGS'] = self.Workspace.UniFlag\r
         return BuildOptions, BuildRuleOrder\r
 \r
-    Platform            = property(_GetPlatform)\r
-    Name                = property(_GetName)\r
-    Guid                = property(_GetGuid)\r
-    Version             = property(_GetVersion)\r
-\r
-    OutputDir           = property(_GetOutputDir)\r
-    BuildDir            = property(_GetBuildDir)\r
-    MakeFileDir         = property(_GetMakeFileDir)\r
-    FdfFile             = property(_GetFdfFile)\r
-\r
-    PcdTokenNumber      = property(_GetPcdTokenNumbers)    # (TokenCName, TokenSpaceGuidCName) : GeneratedTokenNumber\r
-    DynamicPcdList      = property(_GetDynamicPcdList)    # [(TokenCName1, TokenSpaceGuidCName1), (TokenCName2, TokenSpaceGuidCName2), ...]\r
-    NonDynamicPcdList   = property(_GetNonDynamicPcdList)    # [(TokenCName1, TokenSpaceGuidCName1), (TokenCName2, TokenSpaceGuidCName2), ...]\r
-    NonDynamicPcdDict   = property(_GetNonDynamicPcdDict)\r
-    PackageList         = property(_GetPackageList)\r
-\r
-    ToolDefinition      = property(_GetToolDefinition)    # toolcode : tool path\r
-    ToolDefinitionFile  = property(_GetToolDefFile)    # toolcode : lib path\r
-    ToolChainFamily     = property(_GetToolChainFamily)\r
-    BuildRuleFamily     = property(_GetBuildRuleFamily)\r
-    BuildOption         = property(_GetBuildOptions)    # toolcode : option\r
-    EdkBuildOption      = property(_GetEdkBuildOptions)   # edktoolcode : option\r
-    EdkIIBuildOption    = property(_GetEdkIIBuildOptions) # edkiitoolcode : option\r
-\r
-    BuildCommand        = property(_GetBuildCommand)\r
-    BuildRule           = property(_GetBuildRule)\r
-    ModuleAutoGenList   = property(_GetModuleAutoGenList)\r
-    LibraryAutoGenList  = property(_GetLibraryAutoGenList)\r
-    GenFdsCommand       = property(_GenFdsCommand)\r
-\r
 #\r
 # extend lists contained in a dictionary with lists stored in another dictionary\r
 # if CopyToDict is not derived from DefaultDict(list) then this may raise exception\r
@@ -2536,7 +2478,6 @@ class ModuleAutoGen(AutoGen):
 \r
         self.Workspace = Workspace\r
         self.WorkspaceDir = Workspace.WorkspaceDir\r
-        self._GuidDict = Workspace._GuidDict\r
         self.MetaFile = ModuleFile\r
         self.PlatformInfo = PlatformAutoGen(Workspace, PlatformFile, Target, Toolchain, Arch)\r
 \r