BaseTools: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / BuildClassObject.py

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index b67414b930fb3233627e4be65524e22e48f36b1e..33d88c6921b38edc776a8c7dea333c7db1fe1687 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -2,13 +2,7 @@
 # This file is used to define each component of the build database\r
 #\r
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.  The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 from collections import OrderedDict, namedtuple\r
@@ -94,13 +88,13 @@ class PcdClassObject(object):
                         deme = ArrayIndex.findall(demesionattr)\r
                         for i in range(len(deme)-1):\r
                             if int(deme[i].lstrip("[").rstrip("]").strip()) > int(self._Capacity[i]):\r
-                                print "error"\r
+                                print ("error")\r
         if hasattr(self,"DefaultValues"):\r
             for demesionattr in self.DefaultValues:\r
                 deme = ArrayIndex.findall(demesionattr)\r
                 for i in range(len(deme)-1):\r
                     if int(deme[i].lstrip("[").rstrip("]").strip()) > int(self._Capacity[i]):\r
-                        print "error"\r
+                        print ("error")\r
         return self._Capacity\r
     @property\r
     def DatumType(self):\r
@@ -176,7 +170,7 @@ class PcdClassObject(object):
     ## Convert the class to a string\r
     #\r
     #  Convert each member of the class to string\r
-    #  Organize to a signle line format string\r
+    #  Organize to a single line format string\r
     #\r
     #  @retval Rtn Formatted String\r
     #\r
@@ -222,6 +216,7 @@ class PcdClassObject(object):
         new_pcd.DefaultValue = self.DefaultValue\r
         new_pcd.TokenValue = self.TokenValue\r
         new_pcd.MaxDatumSize = self.MaxDatumSize\r
+        new_pcd.MaxSizeUserSet = self.MaxSizeUserSet\r
 \r
         new_pcd.Phase = self.Phase\r
         new_pcd.Pending = self.Pending\r
@@ -270,6 +265,7 @@ class StructurePcd(PcdClassObject):
         self.ValueChain = set()\r
         self.PcdFieldValueFromComm = OrderedDict()\r
         self.PcdFieldValueFromFdf = OrderedDict()\r
+        self.DefaultFromDSC=None\r
     def __repr__(self):\r
         return self.TypeName\r
 \r
@@ -326,7 +322,6 @@ class StructurePcd(PcdClassObject):
             self.PackageDecs = PcdObject.PackageDecs if PcdObject.PackageDecs else self.PackageDecs\r
             self.DefaultValues = PcdObject.DefaultValues if PcdObject.DefaultValues else self.DefaultValues\r
             self.PcdMode = PcdObject.PcdMode if PcdObject.PcdMode else self.PcdMode\r
-            self.DefaultFromDSC=None\r
             self.DefaultValueFromDec = PcdObject.DefaultValueFromDec if PcdObject.DefaultValueFromDec else self.DefaultValueFromDec\r
             self.SkuOverrideValues = PcdObject.SkuOverrideValues if PcdObject.SkuOverrideValues else self.SkuOverrideValues\r
             self.StructName = PcdObject.DatumType if PcdObject.DatumType else self.StructName\r
@@ -412,7 +407,6 @@ class ModuleBuildClassObject(object):
         self.PcdIsDriver             = ''\r
         self.BinaryModule            = ''\r
         self.Shadow                  = ''\r
-        self.SourceOverridePath      = ''\r
         self.CustomMakefile          = {}\r
         self.Specification           = {}\r
         self.LibraryClass            = []\r