1. Add a checkpoint to check duplicated PCD defined in one DEC file.

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1274 7335b38e-4728-0410-8992-fb3ffe349368
mcb30 · Jul 3, 2008 · e8e3bd5 · e8e3bd5
1 parent 2d81b76
commit e8e3bd5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/Source/Python/Ecc/Check.py b/Source/Python/Ecc/Check.py
@@ -596,12 +596,30 @@ def MetaDataFileCheckPcdDuplicate(self):
                          and A.Value2 = B.Value2
                          and A.Enabled > -1
                          and B.Enabled > -1
+                         group by A.ID
                          """% (MODEL_PCD, MODEL_META_DATA_HEADER, MODEL_PCD, MODEL_META_DATA_HEADER)
             RecordSet = EccGlobalData.gDb.TblDsc.Exec(SqlCommand)
             for Record in RecordSet:
                 EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, OtherMsg = "The PCD '%s' is defined in both FDF file and DSC file" % (Record[1]), BelongsToTable = 'Dsc', BelongsToItem = Record[0])
                 EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, OtherMsg = "The PCD '%s' is defined in both FDF file and DSC file" % (Record[3]), BelongsToTable = 'Fdf', BelongsToItem = Record[2])
 
+            EdkLogger.quiet("Checking for duplicate PCDs defined in DEC files ...")
+            SqlCommand = """
+                         select A.ID, A.Value2 from Dec as A, Dec as B 
+                         where A.Model >= %s and A.Model < %s 
+                         and B.Model >= %s and B.Model < %s 
+                         and A.Value2 = B.Value2
+                         and ((A.Model != 'COMMON' 
+                         and B.Model = 'COMMON') or (A.Model = B.Model))
+                         and A.ID != B.ID
+                         and A.Enabled > -1
+                         and B.Enabled > -1
+                         and A.BelongsToFile = B.BelongsToFile
+                         group by A.ID
+                         """% (MODEL_PCD, MODEL_META_DATA_HEADER, MODEL_PCD, MODEL_META_DATA_HEADER)
+            RecordSet = EccGlobalData.gDb.TblDsc.Exec(SqlCommand)
+            for Record in RecordSet:
+                EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE, OtherMsg = "The PCD '%s' is defined duplicated in DEC file" % (Record[1]), BelongsToTable = 'Dec', BelongsToItem = Record[0])
     #
     # Check whether PCD settings in the FDF file can only be related to flash.
     #

diff --git a/Source/Python/Ecc/EccToolError.py b/Source/Python/Ecc/EccToolError.py
@@ -161,7 +161,7 @@
     ERROR_META_DATA_FILE_CHECK_LIBRARY_INSTANCE_ORDER : "The library Instances specified by the LibraryClasses sections should be listed in order of dependencies",
     ERROR_META_DATA_FILE_CHECK_LIBRARY_NO_USE : "There should be no unnecessary inclusion of library classes in the INF file",
     ERROR_META_DATA_FILE_CHECK_BINARY_INF_IN_FDF : "An INF file is specified in the FDF file, but not in the DSC file, therefore the INF file must be for a Binary module only",
-    ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE : "Duplicate PCDs found in both FDF and DSC files",
+    ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE : "Duplicate PCDs found",
     ERROR_META_DATA_FILE_CHECK_PCD_FLASH : "PCD settings in the FDF file should only be related to flash",
     ERROR_META_DATA_FILE_CHECK_PCD_NO_USE : "There should be no PCDs declared in INF files that are not specified in in either a DSC or FDF file",
     ERROR_META_DATA_FILE_CHECK_DUPLICATE_GUID : "Duplicate GUID found",