BaseTools: add new command line option to support override PCD value

this patch add new feature to support override PCD value on the command
line. The value from the command line is the highest priority.
1.Add option(--pcd) to support both PcdName and TokenSpaceGuild.PcdName
2.For void* type PCD, use following format:
  cstring PCD: --pcd PcdName="string"
  unicodestring PCD: --pcd PcdName=L"string"
  CArray PCD: --pcd PcdName=B"{0x1, 0x2}"
3.Build Report, use *B to show the PCD value was overridden in the
command line.
4.Error Condition:
Report error if the PCD is not found
Report error if the PcdName is found under multiple different TokenSpaceGuid
Report error if PCD value syntax is incorrect
Report error if void* type PCD value exceed its max size

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
(cherry picked from commit 763e8edf610b2ccf422986c81ee36b4733560cdb)

2 files changed, 29 insertions, 13 deletions

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 04a4d7dbd5..2dc02c2c4e 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -42,6 +42,7 @@ from Common.DataType import TAB_BRG_LIBRARY
 from Common.DataType import TAB_BACK_SLASH

 from Common.LongFilePathSupport import OpenLongFilePath as open

 from Common.MultipleWorkspace import MultipleWorkspace as mws

+import Common.GlobalData as GlobalData

 

 ## Pattern to extract contents in EDK DXS files

 gDxsDependencyPattern = re.compile(r"DEPENDENCY_START(.+)DEPENDENCY_END", re.DOTALL)

@@ -727,6 +728,7 @@ class PcdReport(object):
             #

             FileWrite(File, gSectionStart)

             FileWrite(File, "Platform Configuration Database Report")

+            FileWrite(File, "  *B  - PCD override in the build option")

             FileWrite(File, "  *P  - Platform scoped PCD override in DSC file")

             FileWrite(File, "  *F  - Platform scoped PCD override in FDF file")

             FileWrite(File, "  *M  - Module scoped PCD override")

@@ -767,6 +769,15 @@ class PcdReport(object):
                         InfDefault, PcdValue = ModulePcdSet[Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Type]

                         if InfDefault == "":

                             InfDefault = None

+

+                    BuildOptionMatch = False

+                    if GlobalData.BuildOptionPcd:

+                        for pcd in GlobalData.BuildOptionPcd:

+                            if (Pcd.TokenSpaceGuidCName, Pcd.TokenCName) == (pcd[0], pcd[1]):

+                                PcdValue = pcd[2]

+                                BuildOptionMatch = True

+                                break

+

                     if First:

                         if ModulePcdSet == None:

                             FileWrite(File, "")

@@ -812,7 +823,9 @@ class PcdReport(object):
                     #

                     # Report PCD item according to their override relationship

                     #

-                    if DecMatch and InfMatch:

+                    if BuildOptionMatch:

+                        FileWrite(File, ' *B %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '(' + Pcd.DatumType + ')', PcdValue.strip()))

+                    elif DecMatch and InfMatch:

                         FileWrite(File, '    %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '(' + Pcd.DatumType + ')', PcdValue.strip()))

                     else:

                         if DscMatch:

@@ -840,17 +853,18 @@ class PcdReport(object):
                         FileWrite(File, '    %*s = %s' % (self.MaxLen + 19, 'DEC DEFAULT', DecDefaultValue.strip()))

 

                     if ModulePcdSet == None:

-                        ModuleOverride = self.ModulePcdOverride.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName), {})

-                        for ModulePath in ModuleOverride:

-                            ModuleDefault = ModuleOverride[ModulePath]

-                            if Pcd.DatumType in ('UINT8', 'UINT16', 'UINT32', 'UINT64'):

-                                ModulePcdDefaultValueNumber = int(ModuleDefault.strip(), 0)

-                                Match = (ModulePcdDefaultValueNumber == PcdValueNumber)

-                            else:

-                                Match = (ModuleDefault.strip() == PcdValue.strip())

-                            if Match:

-                                continue

-                            FileWrite(File, ' *M %-*s = %s' % (self.MaxLen + 19, ModulePath, ModuleDefault.strip()))

+                        if not BuildOptionMatch:

+                            ModuleOverride = self.ModulePcdOverride.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName), {})

+                            for ModulePath in ModuleOverride:

+                                ModuleDefault = ModuleOverride[ModulePath]

+                                if Pcd.DatumType in ('UINT8', 'UINT16', 'UINT32', 'UINT64'):

+                                    ModulePcdDefaultValueNumber = int(ModuleDefault.strip(), 0)

+                                    Match = (ModulePcdDefaultValueNumber == PcdValueNumber)

+                                else:

+                                    Match = (ModuleDefault.strip() == PcdValue.strip())

+                                if Match:

+                                    continue

+                                FileWrite(File, ' *M %-*s = %s' % (self.MaxLen + 19, ModulePath, ModuleDefault.strip()))

 

         if ModulePcdSet == None:

             FileWrite(File, gSectionEnd)

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 23ca76e82c..5619638bd8 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -53,7 +53,7 @@ import Common.GlobalData as GlobalData
 # Version and Copyright

 VersionNumber = "0.60" + ' ' + gBUILD_VERSION

 __version__ = "%prog Version " + VersionNumber

-__copyright__ = "Copyright (c) 2007 - 2014, Intel Corporation  All rights reserved."

+__copyright__ = "Copyright (c) 2007 - 2016, Intel Corporation  All rights reserved."

 

 ## standard targets of build command

 gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run']

@@ -747,6 +747,7 @@ class Build():
         self.BuildReport    = BuildReport(BuildOptions.ReportFile, BuildOptions.ReportType)

         self.TargetTxt      = TargetTxtClassObject()

         self.ToolDef        = ToolDefClassObject()

+        GlobalData.BuildOptionPcd     = BuildOptions.OptionPcd

         #Set global flag for build mode

         GlobalData.gIgnoreSource = BuildOptions.IgnoreSources

 

@@ -1929,6 +1930,7 @@ def MyOptionParser():
     Parser.add_option("--conf", action="store", type="string", dest="ConfDirectory", help="Specify the customized Conf directory.")

     Parser.add_option("--check-usage", action="store_true", dest="CheckUsage", default=False, help="Check usage content of entries listed in INF file.")

     Parser.add_option("--ignore-sources", action="store_true", dest="IgnoreSources", default=False, help="Focus to a binary build and ignore all source files")

+    Parser.add_option("--pcd", action="append", dest="OptionPcd", help="Set PCD value by command line. Format: 'PcdName=Value' ")

 

     (Opt, Args) = Parser.parse_args()

     return (Opt, Args)