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

25 files changed, 56 insertions, 51 deletions

diff --git a/BaseTools/Source/Python/Common/BuildToolError.py b/BaseTools/Source/Python/Common/BuildToolError.py
index a49de46401..9986ba2b0d 100644
--- a/BaseTools/Source/Python/Common/BuildToolError.py
+++ b/BaseTools/Source/Python/Common/BuildToolError.py
@@ -1,8 +1,8 @@
 ## @file
 # Standardized Error Hanlding infrastructures.
 #
-# Copyright (c) 2007, Intel Corporation
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2007, 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
diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/Python/Common/DataType.py
index dd33380a1e..982d710ce5 100644
--- a/BaseTools/Source/Python/Common/DataType.py
+++ b/BaseTools/Source/Python/Common/DataType.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define common static strings used by INF/DEC/DSC files

 #

-# Copyright (c) 2007 ~ 2008, Intel Corporation

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

+# Copyright (c) 2007 - 2008, 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

diff --git a/BaseTools/Source/Python/Common/Database.py b/BaseTools/Source/Python/Common/Database.py
index e645337a39..5c0a79f291 100644
--- a/BaseTools/Source/Python/Common/Database.py
+++ b/BaseTools/Source/Python/Common/Database.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to create a database used by ECC tool

 #

-# Copyright (c) 2007 ~ 2008, Intel Corporation

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

+# Copyright (c) 2007 - 2008, 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

diff --git a/BaseTools/Source/Python/Common/DecClassObject.py b/BaseTools/Source/Python/Common/DecClassObject.py
index b95ff621cc..ffa485979d 100644
--- a/BaseTools/Source/Python/Common/DecClassObject.py
+++ b/BaseTools/Source/Python/Common/DecClassObject.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define each component of DEC file

 #

-# Copyright (c) 2007, Intel Corporation

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

+# Copyright (c) 2007, 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

diff --git a/BaseTools/Source/Python/Common/DecClassObjectLight.py b/BaseTools/Source/Python/Common/DecClassObjectLight.py
index 7c572a56f0..1982dd05a0 100644
--- a/BaseTools/Source/Python/Common/DecClassObjectLight.py
+++ b/BaseTools/Source/Python/Common/DecClassObjectLight.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define each component of DEC file in light mode

 #

-# Copyright (c) 2008, Intel Corporation

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

+# Copyright (c) 2008, 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

diff --git a/BaseTools/Source/Python/Common/Dictionary.py b/BaseTools/Source/Python/Common/Dictionary.py
index 3c968f5ec6..e3460e9891 100644
--- a/BaseTools/Source/Python/Common/Dictionary.py
+++ b/BaseTools/Source/Python/Common/Dictionary.py
@@ -1,8 +1,8 @@
 ## @file

 # Define a dictionary structure

 #

-# Copyright (c) 2007, Intel Corporation

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

+# Copyright (c) 2007, 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

diff --git a/BaseTools/Source/Python/Common/DscClassObject.py b/BaseTools/Source/Python/Common/DscClassObject.py
index c25580ac37..943bc6948e 100644
--- a/BaseTools/Source/Python/Common/DscClassObject.py
+++ b/BaseTools/Source/Python/Common/DscClassObject.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define each component of DSC file

 #

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

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

+# Copyright (c) 2007 - 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

diff --git a/BaseTools/Source/Python/Common/EdkIIWorkspace.py b/BaseTools/Source/Python/Common/EdkIIWorkspace.py
index a494e814a6..d041b35411 100644
--- a/BaseTools/Source/Python/Common/EdkIIWorkspace.py
+++ b/BaseTools/Source/Python/Common/EdkIIWorkspace.py
@@ -1,8 +1,8 @@
 ## @file

 # This is the base class for applications that operate on an EDK II Workspace 

 #

-# Copyright (c) 2007, Intel Corporation

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

+# Copyright (c) 2007, 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

diff --git a/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py b/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
index c33b9bff0b..69a67eda39 100644
--- a/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
+++ b/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define each component of the build database

 #

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

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

+# Copyright (c) 2007 - 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

diff --git a/BaseTools/Source/Python/Common/EdkLogger.py b/BaseTools/Source/Python/Common/EdkLogger.py
index ce4cfa14bb..a3bcb3a147 100644
--- a/BaseTools/Source/Python/Common/EdkLogger.py
+++ b/BaseTools/Source/Python/Common/EdkLogger.py
@@ -1,8 +1,8 @@
 ## @file
 # This file implements the log mechanism for Python tools.
 #
-# Copyright (c) 2007, Intel Corporation
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2007, 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
diff --git a/BaseTools/Source/Python/Common/FdfClassObject.py b/BaseTools/Source/Python/Common/FdfClassObject.py
index e0df1c20c2..3e7d44954c 100644
--- a/BaseTools/Source/Python/Common/FdfClassObject.py
+++ b/BaseTools/Source/Python/Common/FdfClassObject.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define each component of FDF file

 #

-# Copyright (c) 2008, Intel Corporation

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

+# Copyright (c) 2008, 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

diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py
index b181e65d16..5d0fd7f67b 100644
--- a/BaseTools/Source/Python/Common/FdfParserLite.py
+++ b/BaseTools/Source/Python/Common/FdfParserLite.py
@@ -1,9 +1,9 @@
 ## @file

 # parse FDF file

 #

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

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

 #

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

+#  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

diff --git a/BaseTools/Source/Python/Common/GlobalData.py b/BaseTools/Source/Python/Common/GlobalData.py
index d56152ec8a..6c7f085810 100644
--- a/BaseTools/Source/Python/Common/GlobalData.py
+++ b/BaseTools/Source/Python/Common/GlobalData.py
@@ -1,8 +1,8 @@
 ## @file
 # This file is used to define common static strings used by INF/DEC/DSC files
 #
-# Copyright (c) 2007, Intel Corporation
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2007, 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
diff --git a/BaseTools/Source/Python/Common/Identification.py b/BaseTools/Source/Python/Common/Identification.py
index a9b2f33d55..f43150dfc1 100644
--- a/BaseTools/Source/Python/Common/Identification.py
+++ b/BaseTools/Source/Python/Common/Identification.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define the identification of INF/DEC/DSC files

 #

-# Copyright (c) 2007, Intel Corporation

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

+# Copyright (c) 2007, 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

diff --git a/BaseTools/Source/Python/Common/InfClassObject.py b/BaseTools/Source/Python/Common/InfClassObject.py
index 7127cc5cff..e774d80d69 100644
--- a/BaseTools/Source/Python/Common/InfClassObject.py
+++ b/BaseTools/Source/Python/Common/InfClassObject.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define each component of INF file

 #

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

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

+# Copyright (c) 2007 - 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

diff --git a/BaseTools/Source/Python/Common/InfClassObjectLight.py b/BaseTools/Source/Python/Common/InfClassObjectLight.py
index 179b75e28a..020addfdb7 100644
--- a/BaseTools/Source/Python/Common/InfClassObjectLight.py
+++ b/BaseTools/Source/Python/Common/InfClassObjectLight.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define each component of INF file

 #

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

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

+# Copyright (c) 2007 - 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

diff --git a/BaseTools/Source/Python/Common/MigrationUtilities.py b/BaseTools/Source/Python/Common/MigrationUtilities.py
index 8573f0b692..b15daa8448 100644
--- a/BaseTools/Source/Python/Common/MigrationUtilities.py
+++ b/BaseTools/Source/Python/Common/MigrationUtilities.py
@@ -1,8 +1,8 @@
 ## @file

 # Contains several utilitities shared by migration tools.

 #

-# Copyright (c) 2007, Intel Corporation

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

+# Copyright (c) 2007, 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

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 546dd37772..126985fdac 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1,8 +1,8 @@
 ## @file
 # Common routines used by all tools
 #
-# Copyright (c) 2007, Intel Corporation
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2007, 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
@@ -1322,7 +1322,12 @@ class PathClass(object):
 
         RealFile, RealRoot = RealPath2(self.File, self.Root, self.AlterRoot)
         if not RealRoot and not RealFile:
-            return FILE_NOT_FOUND, self.File
+            RealFile = self.File
+            if self.AlterRoot:
+                RealFile = os.path.join(self.AlterRoot, self.File)
+            elif self.Root:
+                RealFile = os.path.join(self.Root, self.File)
+            return FILE_NOT_FOUND, os.path.join(self.AlterRoot, RealFile)
 
         ErrorCode = 0
         ErrorInfo = ''
diff --git a/BaseTools/Source/Python/Common/Parsing.py b/BaseTools/Source/Python/Common/Parsing.py
index 3884b0521c..ce1e60338e 100644
--- a/BaseTools/Source/Python/Common/Parsing.py
+++ b/BaseTools/Source/Python/Common/Parsing.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define common parsing related functions used in parsing INF/DEC/DSC process

 #

-# 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

diff --git a/BaseTools/Source/Python/Common/String.py b/BaseTools/Source/Python/Common/String.py
index 5da0cacfb0..1f199fe2ca 100644
--- a/BaseTools/Source/Python/Common/String.py
+++ b/BaseTools/Source/Python/Common/String.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define common string related functions used in parsing process

 #

-# Copyright (c) 2007 ~ 2008, Intel Corporation

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

+# Copyright (c) 2007 - 2008, 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

diff --git a/BaseTools/Source/Python/Common/TargetTxtClassObject.py b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
index 70178f54ce..fc5d589a59 100644
--- a/BaseTools/Source/Python/Common/TargetTxtClassObject.py
+++ b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define each component of Target.txt file

 #

-# Copyright (c) 2007, Intel Corporation

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

+# Copyright (c) 2007, 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

diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseTools/Source/Python/Common/ToolDefClassObject.py
index 5a9a3096bb..549f76cee9 100644
--- a/BaseTools/Source/Python/Common/ToolDefClassObject.py
+++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to define each component of tools_def.txt file

 #

-# Copyright (c) 2007, Intel Corporation

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

+# Copyright (c) 2007, 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

diff --git a/BaseTools/Source/Python/Common/XmlParser.py b/BaseTools/Source/Python/Common/XmlParser.py
index 4d60115925..dcafb5f156 100644
--- a/BaseTools/Source/Python/Common/XmlParser.py
+++ b/BaseTools/Source/Python/Common/XmlParser.py
@@ -1,8 +1,8 @@
 ## @file

 # This file is used to parse a xml file of .PKG file

 #

-# Copyright (c) 2008, Intel Corporation

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

+# Copyright (c) 2008, 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

diff --git a/BaseTools/Source/Python/Common/XmlRoutines.py b/BaseTools/Source/Python/Common/XmlRoutines.py
index e5fedae83d..5823067056 100644
--- a/BaseTools/Source/Python/Common/XmlRoutines.py
+++ b/BaseTools/Source/Python/Common/XmlRoutines.py
@@ -2,8 +2,8 @@
 # This is an XML API that uses a syntax similar to XPath, but it is written in

 # standard python so that no extra python packages are required to use it.

 #

-# Copyright (c) 2007, Intel Corporation

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

+# Copyright (c) 2007, 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

diff --git a/BaseTools/Source/Python/Common/__init__.py b/BaseTools/Source/Python/Common/__init__.py
index b289a2b0d8..d8a96f9bfb 100644
--- a/BaseTools/Source/Python/Common/__init__.py
+++ b/BaseTools/Source/Python/Common/__init__.py
@@ -4,8 +4,8 @@
 # This file is required to make Python interpreter treat the directory

 # as containing package.

 #

-# Copyright (c) 2007 - 2010, Intel Corporation<BR>

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

+# Copyright (c) 2007 - 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