SF.net SVN: edk2-buildtools:[2510] trunk/BaseTools/Source/Python/AutoGen/ AutoGen.py

[<yi...@us...>]

Revision: 2510
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2510&view=rev
Author:   yingke
Date:     2012-04-01 08:34:35 +0000 (Sun, 01 Apr 2012)
Log Message:
-----------
Roll back 2509 to 2508. Changes of 2509 does more check for modules even if they are not used by current build arch.

Signed-off-by: Yingke Liu <yin...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/AutoGen/AutoGen.py

Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py	2012-03-31 08:08:58 UTC (rev 2509)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py	2012-04-01 08:34:35 UTC (rev 2510)
@@ -287,23 +287,22 @@
             if self.CapTargetList:
                 EdkLogger.info("No flash definition file found. Capsule [%s] will be ignored." % " ".join(self.CapTargetList))
                 self.CapTargetList = []
+        
+        # apply SKU and inject PCDs from Flash Definition file
+        for Arch in self.ArchList:
+            Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
 
-        # Collect all declared PCD to check if PCDs used in FDF and DSC are declared.
-        AllDeclaredPcd = set()
-        for Arch in self.Platform.SupArchList:
+            DecPcds = set()
             PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
             Pkgs = PGen.PackageList
             for Pkg in Pkgs:
                 for Pcd in Pkg.Pcds.keys():
-                    AllDeclaredPcd.add((Pcd[0], Pcd[1]))
+                    DecPcds.add((Pcd[0], Pcd[1]))
+            Platform.IsPlatformPcdDeclared(DecPcds)
 
-        # apply SKU and inject PCDs from Flash Definition file
-        for Arch in self.ArchList:
-            Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
-            Platform.IsPlatformPcdDeclared(AllDeclaredPcd)
             Platform.SkuName = self.SkuId
             for Name, Guid in PcdSet:
-                if (Name, Guid) not in AllDeclaredPcd:
+                if (Name, Guid) not in DecPcds:
                     EdkLogger.error(
                         'build',
                         PARSER_ERROR,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.