BaseTools/ECC: Fix some issues of ECC tool

[mirror_edk2.git] / BaseTools / Source / Python / Common / EdkIIWorkspaceBuild.py

diff --git a/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py b/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
index 82ab1796ad53f761156992ebed77a3dd54e7565a..d6df01d4ce0654e8a671c4f1f3a041bfae044e4c 100644 (file)
--- a/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
+++ b/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
@@ -1,8 +1,8 @@
 ## @file\r
 # This file is used to define each component of the build database\r
 #\r
-# Copyright (c) 2007 ~ 2008, Intel Corporation\r
-# All rights reserved. This program and the accompanying materials\r
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php\r
@@ -14,7 +14,7 @@
 ##\r
 # Import Modules\r
 #\r
-import os, string, copy, pdb, copy\r
+import Common.LongFilePathOs as os, string, copy, pdb, copy\r
 import EdkLogger\r
 import DataType\r
 from InfClassObject import *\r
@@ -405,7 +405,7 @@ class ItemBuild(object):
 #\r
 # @var WorkspaceDir:      To store value for WorkspaceDir\r
 # @var SupArchList:       To store value for SupArchList, selection scope is in below list\r
-#                         EBC | IA32 | X64 | IPF | ARM | PPC\r
+#                         EBC | IA32 | X64 | IPF | ARM | PPC | AARCH64\r
 # @var BuildTarget:       To store value for WorkspaceDir, selection scope is in below list\r
 #                         RELEASE | DEBUG\r
 # @var SkuId:             To store value for SkuId\r
@@ -748,7 +748,8 @@ class WorkspaceBuild(object):
                 #\r
                 Pb.Specification = ModuleHeader.Specification\r
                 Pb.Specification[TAB_INF_DEFINES_EDK_RELEASE_VERSION] = ModuleHeader.EdkReleaseVersion\r
-                Pb.Specification[TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION] = ModuleHeader.EfiSpecificationVersion\r
+                Pb.Specification[TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION] = ModuleHeader.UefiSpecificationVersion\r
+                Pb.Specification[TAB_INF_DEFINES_UEFI_SPECIFICATION_VERSION] = ModuleHeader.UefiSpecificationVersion\r
                 Pb.AutoGenVersion = int(ModuleHeader.InfVersion, 0)\r
 \r
                 #\r
@@ -928,13 +929,13 @@ class WorkspaceBuild(object):
         ModuleDatabase = self.Build[Arch].ModuleDatabase\r
         ModuleType = Module.ModuleType\r
 \r
-        # check R8 module\r
+        # check Edk module\r
         if Module.AutoGenVersion < 0x00010005:\r
             EdkLogger.verbose("")\r
             EdkLogger.verbose("Library instances of module [%s] [%s]:" % (str(Module), Arch))\r
             LibraryConsumerList = [Module]\r
 \r
-            # "CompilerStub" is a must for R8 modules\r
+            # "CompilerStub" is a must for Edk modules\r
             Module.Libraries.append("CompilerStub")\r
             while len(LibraryConsumerList) > 0:\r
                 M = LibraryConsumerList.pop()\r
@@ -951,7 +952,7 @@ class WorkspaceBuild(object):
                         EdkLogger.verbose("\t" + LibraryName + " : " + LibraryFile)\r
             return\r
 \r
-        # R9 module\r
+        # EdkII module\r
         LibraryConsumerList = [Module]\r
         Constructor         = []\r
         ConsumedByList      = sdict()\r