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

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

Revision: 2237
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2237&view=rev
Author:   yingke
Date:     2011-08-08 05:45:44 +0000 (Mon, 08 Aug 2011)

Log Message:
-----------
The type of a PCD defined in a DSC file should match the possible types for this PCD in the DEC file.

Signed-off-by: yingke
Reviewed-by: jsu1, gikidy

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

Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py	2011-08-08 05:44:13 UTC (rev 2236)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py	2011-08-08 05:45:44 UTC (rev 2237)
@@ -269,6 +269,11 @@
         #
         self._CheckAllPcdsTokenValueConflict()
         
+        #
+        # Check PCD type and definition between DSC and DEC
+        #
+        self._CheckPcdDefineAndType()
+        
         self._BuildDir = None
         self._FvDir = None
         self._MakeFileDir = None
@@ -276,6 +281,52 @@
 
         return True
 
+    def _CheckPcdDefineAndType(self):
+        PcdTypeList = [
+            "FixedAtBuild", "PatchableInModule", "FeatureFlag",
+            "Dynamic", #"DynamicHii", "DynamicVpd",
+            "DynamicEx", # "DynamicExHii", "DynamicExVpd"
+        ]
+
+        for Pa in self.AutoGenObjectList:
+            # Key of DSC's Pcds dictionary is PcdCName, TokenSpaceGuid
+            for Pcd in Pa.Platform.Pcds:
+                PcdType = Pa.Platform.Pcds[Pcd].Type
+                
+                # If no PCD type, this PCD comes from FDF 
+                if not PcdType:
+                    continue
+                
+                # Try to remove Hii and Vpd suffix
+                if PcdType.startswith("DynamicEx"):
+                    PcdType = "DynamicEx"
+                elif PcdType.startswith("Dynamic"):
+                    PcdType = "Dynamic"
+    
+                for Package in Pa.PackageList:
+                    # Key of DEC's Pcds dictionary is PcdCName, TokenSpaceGuid, PcdType
+                    if (Pcd[0], Pcd[1], PcdType) in Package.Pcds:
+                        break
+                    for Type in PcdTypeList:
+                        if (Pcd[0], Pcd[1], Type) in Package.Pcds:
+                            EdkLogger.error(
+                                'build',
+                                FORMAT_INVALID,
+                                "Type [%s] of PCD [%s.%s] in DSC file doesn't match the type [%s] defined in DEC file." \
+                                % (Pa.Platform.Pcds[Pcd].Type, Pcd[1], Pcd[0], Type),
+                                ExtraData=None
+                            )
+                            return
+                else:
+                    EdkLogger.error(
+                        'build',
+                        FORMAT_INVALID,
+                        "This Pcd is not defined in DEC files: [%s.%s]." \
+                        % (Pcd[1], Pcd[0]),
+                        ExtraData=None
+                    )
+                    return
+
     def __repr__(self):
         return "%s [%s]" % (self.MetaFile, ", ".join(self.ArchList))
 


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