git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@254 7335b...

diff --git a/Source/Python/DataType.py b/Source/Python/DataType.py
index 00760fa..77f473b 100644 (file)
--- a/Source/Python/DataType.py
+++ b/Source/Python/DataType.py
@@ -183,24 +183,33 @@ TAB_COMMON_DEFINES = 'Defines'
 TAB_INF_DEFINES = TAB_COMMON_DEFINES\r
 TAB_INF_DEFINES_INF_VERSION = 'INF_VERSION'\r
 TAB_INF_DEFINES_BASE_NAME = 'BASE_NAME'\r
-TAB_INF_DEFINES_EDK_RELEASE_VERSION = 'EDK_RELEASE_VERSION'\r
-TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION = 'EFI_SPECIFICATION_VERSION'\r
 TAB_INF_DEFINES_FILE_GUID = 'FILE_GUID'\r
 TAB_INF_DEFINES_MODULE_TYPE = 'MODULE_TYPE'\r
+TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION = 'EFI_SPECIFICATION_VERSION'\r
+TAB_INF_DEFINES_EDK_RELEASE_VERSION = 'EDK_RELEASE_VERSION'\r
 TAB_INF_DEFINES_BINARY_MODULE = 'BINARY_MODULE'\r
+TAB_INF_DEFINES_LIBRARY_CLASS = 'LIBRARY_CLASS'\r
+TAB_INF_DEFINES_COMPONENT_TYPE = 'COMPONENT_TYPE'\r
 TAB_INF_DEFINES_MAKEFILE_NAME = 'MAKEFILE_NAME'\r
+TAB_INF_DEFINES_BUILD_NUMBER = 'BUILD_NUMBER'\r
+TAB_INF_DEFINES_BUILD_TYPE = 'BUILD_TYPE'\r
+TAB_INF_DEFINES_FFS_EXT = 'FFS_EXT'\r
+TAB_INF_DEFINES_FV_EXT = 'FV_EXT'\r
+TAB_INF_DEFINES_SOURCE_FV = 'SOURCE_FV'\r
+TAB_INF_DEFINES_VERSION_NUMBER = 'VERSION_NUMBER'\r
 TAB_INF_DEFINES_VERSION_STRING = 'VERSION_STRING'\r
-TAB_INF_DEFINES_VERSION = 'VERSION'\r
-TAB_INF_DEFINES_LIBRARY_CLASS = 'LIBRARY_CLASS'\r
-TAB_INF_DEFINES_PCD_DRIVER = 'PCD_DRIVER'\r
+TAB_INF_DEFINES_PCD_IS_DRIVER = 'PCD_IS_DRIVER'\r
+TAB_INF_DEFINES_TIANO_R8_FLASHMAP_H = 'TIANO_R8_FLASHMAP_H'\r
 TAB_INF_DEFINES_ENTRY_POINT = 'ENTRY_POINT'\r
 TAB_INF_DEFINES_UNLOAD_IMAGE = 'UNLOAD_IMAGE'\r
 TAB_INF_DEFINES_CONSTRUCTOR = 'CONSTRUCTOR'\r
 TAB_INF_DEFINES_DESTRUCTOR = 'DESTRUCTOR'\r
 TAB_INF_DEFINES_DEFINE = 'DEFINE'\r
 TAB_INF_DEFINES_CUSTOM_MAKEFILE = 'CUSTOM_MAKEFILE'\r
-TAB_INF_DEFINES_TOOLS_FLAGS = 'ToolFlags'      #TBD\r
-TAB_INF_DEFINES_MACRO_NAME = 'MacroName'       #TBD\r
+TAB_INF_DEFINES_TOOLS_FLAGS = 'ToolFlags'              #TBD\r
+TAB_INF_DEFINES_MACRO_NAME = 'MacroName'               #TBD\r
+TAB_INF_DEFINES_VARIABLE_NAME = 'VariableName'         #TBD\r
+TAB_INF_DEFINES_SPEC = 'Spec'                          #TBD\r
 \r
 #Dec Definitions\r
 TAB_DEC_DEFINES = TAB_COMMON_DEFINES\r

diff --git a/Source/Python/EdkIIWorkspaceBuild.py b/Source/Python/EdkIIWorkspaceBuild.py
index 0f220d3..e3ec21f 100644 (file)
--- a/Source/Python/EdkIIWorkspaceBuild.py
+++ b/Source/Python/EdkIIWorkspaceBuild.py
@@ -67,6 +67,7 @@ class ModuleBuildClassObject(object):
         self.ModuleType              = ''\r
         self.Guid                    = ''\r
         self.Version                 = ''\r
+        self.PcdIsDriver             = ''\r
         self.CustomMakefile          = {}\r
         self.Specification           = {}\r
         self.LibraryClass            = None      # LibraryClassObject\r
@@ -336,6 +337,7 @@ class WorkspaceBuild(object):
                 pb.Guid = infObj.Defines.DefinesDictionary[TAB_INF_DEFINES_FILE_GUID][0]\r
                 pb.Version = infObj.Defines.DefinesDictionary[TAB_INF_DEFINES_VERSION_STRING][0]\r
                 pb.ModuleType = infObj.Defines.DefinesDictionary[TAB_INF_DEFINES_MODULE_TYPE][0]\r
+                pb.PcdIsDriver = infObj.Defines.DefinesDictionary[TAB_INF_DEFINES_PCD_IS_DRIVER][0]\r
                 \r
                 for Index in range(len(infObj.Defines.DefinesDictionary[TAB_INF_DEFINES_CUSTOM_MAKEFILE])):\r
                     Makefile = infObj.Defines.DefinesDictionary[TAB_INF_DEFINES_CUSTOM_MAKEFILE][Index]\r
@@ -602,6 +604,7 @@ if __name__ == '__main__':
             print 'Version = ', p.Version\r
             print 'CustomMakefile = ', p.CustomMakefile\r
             print 'Specification = ', p.Specification\r
+            print 'PcdIsDriver = ', p.PcdIsDriver\r
             if p.LibraryClass != None:\r
                 print 'LibraryClass = ', p.LibraryClass.LibraryClass\r
                 print 'SupModList = ', p.LibraryClass.SupModList\r

diff --git a/Source/Python/InfClassObject.py b/Source/Python/InfClassObject.py
index 538ab34..dc36845 100644 (file)
--- a/Source/Python/InfClassObject.py
+++ b/Source/Python/InfClassObject.py
@@ -26,25 +26,33 @@ class InfDefines(InfObject):
     def __init__(self):\r
         self.DefinesDictionary = {\r
             #Required\r
-            TAB_INF_DEFINES_BASE_NAME                                        : [''],\r
-            TAB_INF_DEFINES_EDK_RELEASE_VERSION                              : [''],\r
-            TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION                        : [''],\r
-            #Optional\r
-            TAB_INF_DEFINES_FILE_GUID                                        : [''],\r
-            TAB_INF_DEFINES_MODULE_TYPE                                      : [''],\r
-            TAB_INF_DEFINES_BINARY_MODULE                                    : [''],\r
-            TAB_INF_DEFINES_MAKEFILE_NAME                                    : [''],\r
-            TAB_INF_DEFINES_VERSION_STRING                                   : [''],\r
-            TAB_INF_DEFINES_VERSION                                          : [''],\r
-            TAB_INF_DEFINES_LIBRARY_CLASS                                    : [''],\r
-            TAB_INF_DEFINES_PCD_DRIVER                                       : [''],\r
-            TAB_INF_DEFINES_ENTRY_POINT                                      : [''],\r
-            TAB_INF_DEFINES_UNLOAD_IMAGE                                     : [''],\r
-            TAB_INF_DEFINES_CONSTRUCTOR                                      : [''],\r
-            TAB_INF_DEFINES_DESTRUCTOR                                       : [''],\r
-            TAB_INF_DEFINES_DEFINE                                           : [''],\r
-            TAB_INF_DEFINES_CUSTOM_MAKEFILE                                  : [''],\r
-            TAB_INF_DEFINES_INF_VERSION                                      : ['']\r
+            TAB_INF_DEFINES_BASE_NAME                               : [''],\r
+            TAB_INF_DEFINES_FILE_GUID                               : [''],\r
+            TAB_INF_DEFINES_MODULE_TYPE                             : [''],\r
+            TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION               : [''],\r
+            TAB_INF_DEFINES_EDK_RELEASE_VERSION                     : [''],\r
+            \r
+            #Optional            \r
+            TAB_INF_DEFINES_INF_VERSION                             : [''],\r
+            TAB_INF_DEFINES_BINARY_MODULE                           : [''],\r
+            TAB_INF_DEFINES_LIBRARY_CLASS                           : [''],\r
+            TAB_INF_DEFINES_COMPONENT_TYPE                          : [''],\r
+            TAB_INF_DEFINES_MAKEFILE_NAME                           : [''],\r
+            TAB_INF_DEFINES_BUILD_NUMBER                            : [''],\r
+            TAB_INF_DEFINES_BUILD_TYPE                              : [''],\r
+            TAB_INF_DEFINES_FFS_EXT                                 : [''],\r
+            TAB_INF_DEFINES_FV_EXT                                  : [''],\r
+            TAB_INF_DEFINES_SOURCE_FV                               : [''],\r
+            TAB_INF_DEFINES_VERSION_NUMBER                          : [''],\r
+            TAB_INF_DEFINES_VERSION_STRING                          : [''],\r
+            TAB_INF_DEFINES_PCD_IS_DRIVER                           : [''],\r
+            TAB_INF_DEFINES_TIANO_R8_FLASHMAP_H                     : [''],\r
+            TAB_INF_DEFINES_ENTRY_POINT                             : [''],\r
+            TAB_INF_DEFINES_UNLOAD_IMAGE                            : [''],\r
+            TAB_INF_DEFINES_CONSTRUCTOR                             : [''],\r
+            TAB_INF_DEFINES_DESTRUCTOR                              : [''],\r
+            TAB_INF_DEFINES_DEFINE                                  : [''],\r
+            TAB_INF_DEFINES_CUSTOM_MAKEFILE                         : ['']\r
         }\r
         self.ToolFlags = []     #'${FAMILY}:${TARGET}_${TAGNAME}_${ARCH}_${TOOLCODE}_FLAGS'\r
         self.MacroName = '$(MACRO_NAME)'\r