Sync EDKII BaseTools to BaseTools project r1971

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10502 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 4 insertions, 3 deletions

diff --git a/BaseTools/Source/Python/Ecc/EccToolError.py b/BaseTools/Source/Python/Ecc/EccToolError.py
index f6c4097e78..985737f192 100644
--- a/BaseTools/Source/Python/Ecc/EccToolError.py
+++ b/BaseTools/Source/Python/Ecc/EccToolError.py
@@ -1,8 +1,8 @@
 ## @file

 # Standardized Error Hanlding infrastructures.

 #

-# Copyright (c) 2008 - 2010, Intel Corporation

-# All rights reserved. This program and the accompanying materials

+# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>

+# This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

 # http://opensource.org/licenses/bsd-license.php

@@ -92,6 +92,7 @@ ERROR_META_DATA_FILE_CHECK_DUPLICATE_PROTOCOL = 10012
 ERROR_META_DATA_FILE_CHECK_DUPLICATE_PPI = 10013

 ERROR_META_DATA_FILE_CHECK_MODULE_FILE_NO_USE = 10014

 ERROR_META_DATA_FILE_CHECK_PCD_TYPE = 10015

+ERROR_META_DATA_FILE_CHECK_MODULE_FILE_GUID_DUPLICATION = 10016

 

 ERROR_SPELLING_CHECK_ALL = 11000

 

@@ -177,7 +178,7 @@ gEccErrorMessage = {
     ERROR_META_DATA_FILE_CHECK_DUPLICATE_PPI : "Duplicate PPI found",

     ERROR_META_DATA_FILE_CHECK_MODULE_FILE_NO_USE : "No used module files found",

     ERROR_META_DATA_FILE_CHECK_PCD_TYPE : "Wrong C code function used for this kind of PCD",

-

+    ERROR_META_DATA_FILE_CHECK_MODULE_FILE_GUID_DUPLICATION : "Module file has FILE_GUID collision with other module file",

     ERROR_SPELLING_CHECK_ALL : "",

     }