From 52302d4dee589a5df43a464420c9fe68ba83937d Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Sun, 28 Feb 2010 23:39:39 +0000
Subject: 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
---
 BaseTools/Source/Python/CommonDataClass/FdfClass.py    | 10 ++++++++--
 BaseTools/Source/Python/CommonDataClass/ModuleClass.py |  5 ++---
 BaseTools/Source/Python/CommonDataClass/__init__.py    | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'BaseTools/Source/Python/CommonDataClass')

diff --git a/BaseTools/Source/Python/CommonDataClass/FdfClass.py b/BaseTools/Source/Python/CommonDataClass/FdfClass.py
index a9e12ed46d..a6953b8c5a 100644
--- a/BaseTools/Source/Python/CommonDataClass/FdfClass.py
+++ b/BaseTools/Source/Python/CommonDataClass/FdfClass.py
@@ -1,7 +1,7 @@
 ## @file
 # classes represent data in FDF
 #
-#  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
@@ -168,6 +168,7 @@ class DepexSectionClassObject (SectionClassObject):
     def __init__(self):
         self.DepexType = None
         self.Expression = None
+        self.ExpressionProcessed = False
 
 ## Compress section data in FDF
 #
@@ -231,6 +232,7 @@ class FvImageSectionClassObject (SectionClassObject):
         self.FvFileType = None
         self.FvFileName = None
         self.FvFileExtension = None
+        self.FvAddr = None
 
 ## GUIDed section data in FDF
 #
@@ -247,6 +249,9 @@ class GuidSectionClassObject (SectionClassObject) :
         self.SectionType = None
         self.ProcessRequired = False
         self.AuthStatusValid = False
+        self.FvAddr = []
+        self.FvParentAddr = None
+        self.IncludeFvSection = False
 
 ## UI section data in FDF
 #
@@ -290,6 +295,7 @@ class RuleClassObject :
         self.NameGuid = None
         self.Fixed = False
         self.Alignment = None
+        self.SectAlignment = None
         self.CheckSum = False
         self.FvFileType = None       # for Ffs File Type
         self.KeyStringList = []
@@ -399,4 +405,4 @@ class OptionRomClassObject:
     def __init__(self):
         self.DriverName = None
         self.FfsList = []
-        
\ No newline at end of file
+       
diff --git a/BaseTools/Source/Python/CommonDataClass/ModuleClass.py b/BaseTools/Source/Python/CommonDataClass/ModuleClass.py
index 49d052dc45..350350bdf4 100644
--- a/BaseTools/Source/Python/CommonDataClass/ModuleClass.py
+++ b/BaseTools/Source/Python/CommonDataClass/ModuleClass.py
@@ -1,7 +1,7 @@
 ## @file
 # This file is used to define a class object to describe a module
 #
-# 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
@@ -34,7 +34,7 @@ from CommonClass import *
 #                                PEI_PCD_DRIVER | DXE_PCD_DRIVER
 # @var TianoR8FlashMap_h:        To store value for TianoR8FlashMap_h
 # @var InfVersion:               To store value for InfVersion
-# @var EfiSpecificationVersion:  To store value for EfiSpecificationVersion
+# @var UefiSpecificationVersion: To store value for UefiSpecificationVersion
 # @var EdkReleaseVersion:        To store value for EdkReleaseVersion
 # @var LibraryClass:             To store value for LibraryClass, it is a set structure as
 #                                [ LibraryClassClass, ...]
@@ -65,7 +65,6 @@ class ModuleHeaderClass(IdentificationClass, CommonHeaderClass, DefineClass):
         self.PcdIsDriver = ''
         self.TianoR8FlashMap_h = False
         self.InfVersion = ''
-        self.EfiSpecificationVersion = ''
         self.PiSpecificationVersion = ''
         self.UefiSpecificationVersion = ''
         self.EdkReleaseVersion = ''
diff --git a/BaseTools/Source/Python/CommonDataClass/__init__.py b/BaseTools/Source/Python/CommonDataClass/__init__.py
index e69de29bb2..8f81773a95 100644
--- a/BaseTools/Source/Python/CommonDataClass/__init__.py
+++ b/BaseTools/Source/Python/CommonDataClass/__init__.py
@@ -0,0 +1,15 @@
+## @file
+# Python 'CommonDataClass' 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.
+#
-- 
cgit v1.2.3