Sync EDKII BaseTools to BaseTools project r1903.

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

3 files changed, 19 insertions, 4 deletions

diff --git a/BaseTools/Source/Python/msa2inf/ConvertModule.py b/BaseTools/Source/Python/msa2inf/ConvertModule.py
index e0d7b88695..af9aa1d8ec 100644
--- a/BaseTools/Source/Python/msa2inf/ConvertModule.py
+++ b/BaseTools/Source/Python/msa2inf/ConvertModule.py
@@ -2,7 +2,7 @@
 # Convert an MSA Module class object ot an INF Module class object by filling

 # several info required by INF file.

 #

-# Copyright (c) 2007, Intel Corporation

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

 # All rights reserved. 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

@@ -35,7 +35,7 @@ def AddModuleMiscVersion(Module):
     Module.Header.InfVersion = Version

 

     Version = Module.Header.Specification.get("EFI_SPECIFICATION_VERSION", "")

-    Module.Header.EfiSpecificationVersion = Version

+    Module.Header.UefiSpecificationVersion = Version

     

     Version = Module.Header.Specification.get("EDK_RELEASE_VERSION", "")

     Module.Header.EdkReleaseVersion = Version

diff --git a/BaseTools/Source/Python/msa2inf/StoreInf.py b/BaseTools/Source/Python/msa2inf/StoreInf.py
index bb58dc2f2f..6bf46cf0be 100644
--- a/BaseTools/Source/Python/msa2inf/StoreInf.py
+++ b/BaseTools/Source/Python/msa2inf/StoreInf.py
@@ -64,8 +64,8 @@ def StoreModuleDefinesSection(InfFile, Module):
     if ModuleHeader.ModuleType != "":

         DefinesTupleList.append(("MODULE_TYPE", ModuleHeader.ModuleType))

 

-    if ModuleHeader.EfiSpecificationVersion != "":

-        DefinesTupleList.append(("EFI_SPECIFICATION_VERSION", ModuleHeader.EfiSpecificationVersion))

+    if ModuleHeader.UefiSpecificationVersion != "":

+        DefinesTupleList.append(("UEFI_SPECIFICATION_VERSION", ModuleHeader.UefiSpecificationVersion))

     

     if ModuleHeader.EdkReleaseVersion != "":

         DefinesTupleList.append(("EDK_RELEASE_VERSION", ModuleHeader.EdkReleaseVersion))

diff --git a/BaseTools/Source/Python/msa2inf/__init__.py b/BaseTools/Source/Python/msa2inf/__init__.py
index e69de29bb2..e139a80bdb 100644
--- a/BaseTools/Source/Python/msa2inf/__init__.py
+++ b/BaseTools/Source/Python/msa2inf/__init__.py
@@ -0,0 +1,15 @@
+## @file

+# Python 'msa2inf' package initialization file.

+#

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

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

+#

+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+#