Several minor improvements
authorjwang36 <jwang36@7335b38e-4728-0410-8992-fb3ffe349368>
Fri, 7 Dec 2007 05:02:40 +0000 (05:02 +0000)
committerjwang36 <jwang36@7335b38e-4728-0410-8992-fb3ffe349368>
Fri, 7 Dec 2007 05:02:40 +0000 (05:02 +0000)
git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@911 7335b38e-4728-0410-8992-fb3ffe349368

Source/Python/AutoGen/AutoGen.py
Source/Python/Common/DataType.py
Source/Python/Common/EdkIIWorkspaceBuild.py
Source/Python/build/build.py

index da8dc6e..dcd321d 100755 (executable)
@@ -374,7 +374,7 @@ class PlatformAutoGen:
                 if PcdFromModule.DatumType == "VOID*" and PcdFromModule.MaxDatumSize == None:\r
                     NoDatumTypePcdList.add("%s [%s]" % (" | ".join(Key), F))\r
 \r
-                if PcdFromModule.Type in GenC.gDynamicPcd + GenC.gDynamicExPcd:\r
+                if PcdFromModule.Type in GenC.gDynamicPcd or PcdFromModule.Type in GenC.gDynamicExPcd:\r
                     # for autogen code purpose\r
                     if M.ModuleType in ["PEIM", "PEI_CORE"]:\r
                         PcdFromModule.Phase = "PEI"\r
index f1228b2..70e9402 100644 (file)
@@ -160,6 +160,12 @@ TAB_PCDS_DYNAMIC_DEFAULT = 'DynamicDefault'
 TAB_PCDS_DYNAMIC_VPD = 'DynamicVpd'\r
 TAB_PCDS_DYNAMIC_HII = 'DynamicHii'\r
 \r
+PCD_DYNAMIC_TYPE_LIST = [TAB_PCDS_DYNAMIC, TAB_PCDS_DYNAMIC_DEFAULT, TAB_PCDS_DYNAMIC_VPD, TAB_PCDS_DYNAMIC_HII]\r
+PCD_DYNAMIC_EX_TYPE_LIST = [TAB_PCDS_DYNAMIC_EX, TAB_PCDS_DYNAMIC_EX_DEFAULT, TAB_PCDS_DYNAMIC_EX_VPD, TAB_PCDS_DYNAMIC_EX_HII]\r
+\r
+## Dynamic-ex PCD types\r
+gDynamicExPcd = [TAB_PCDS_DYNAMIC_EX, TAB_PCDS_DYNAMIC_EX_DEFAULT, TAB_PCDS_DYNAMIC_EX_VPD, TAB_PCDS_DYNAMIC_EX_HII]\r
+\r
 TAB_PCDS_FIXED_AT_BUILD_NULL = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD\r
 TAB_PCDS_FIXED_AT_BUILD_COMMON = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_COMMON\r
 TAB_PCDS_FIXED_AT_BUILD_IA32 = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_IA32\r
index 9037201..020ce20 100755 (executable)
@@ -1283,11 +1283,11 @@ class WorkspaceBuild(object):
                         EdkLogger.error("AutoGen", PARSER_ERROR, ErrorMsg)\r
 \r
                     NewType = Pcd.Type\r
-                    if NewType.startswith("Dynamic"):\r
-                        if NewType.startswith("DynamicEx"):\r
-                            NewType = "DynamicEx"\r
-                        else:\r
-                            NewType = "Dynamic"\r
+                    if NewType in DataType.PCD_DYNAMIC_TYPE_LIST:\r
+                        NewType = DataType.TAB_PCDS_DYNAMIC\r
+                    elif NewType in DataType.PCD_DYNAMIC_EX_TYPE_LIST:\r
+                        NewType = DataType.TAB_PCDS_DYNAMIC_EX\r
+\r
                 if Pcd.DatumType != '' and Pcd.DatumType != None:\r
                     DatumType = Pcd.DatumType\r
                 if Pcd.TokenValue != '' and Pcd.TokenValue != None:\r
index 8186f52..f9f5f41 100644 (file)
@@ -1161,6 +1161,7 @@ def Main():
         MyBuild.Launch()\r
         MyBuild.DumpBuildData()\r
     except BaseException, X:\r
+        EdkLogger.SetLevel(EdkLogger.QUIET)\r
         if MyBuild != None:\r
             # for multi-thread build exits safely\r
             MyBuild.Relinquish()\r