BaseTools: Replace BSD License with BSD+Patent License

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

diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py
index fc779a9d25981ac6fa2c966dfbdab77889188389..e66b7c983278d0e73345e231756b844cd3d0618a 100644 (file)
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -3,13 +3,7 @@
 #\r
 # Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<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 __future__ import absolute_import\r
@@ -100,9 +94,7 @@ class InfBuildData(ModuleBuildClassObject):
         TAB_INF_DEFINES_VERSION_STRING              : "_Version",\r
         TAB_INF_DEFINES_VERSION                     : "_Version",\r
         TAB_INF_DEFINES_PCD_IS_DRIVER               : "_PcdIsDriver",\r
-        TAB_INF_DEFINES_SHADOW                      : "_Shadow",\r
-\r
-        TAB_COMPONENTS_SOURCE_OVERRIDE_PATH         : "_SourceOverridePath",\r
+        TAB_INF_DEFINES_SHADOW                      : "_Shadow"\r
     }\r
 \r
     # regular expression for converting XXX_FLAGS in [nmake] section to new type\r
@@ -135,10 +127,6 @@ class InfBuildData(ModuleBuildClassObject):
         self._Target = Target\r
         self._Toolchain = Toolchain\r
         self._Platform = TAB_COMMON\r
-        if FilePath.Key in GlobalData.gOverrideDir:\r
-            self._SourceOverridePath = GlobalData.gOverrideDir[FilePath.Key]\r
-        else:\r
-            self._SourceOverridePath = None\r
         self._TailComments = None\r
         self._BaseName = None\r
         self._DxsFile = None\r
@@ -205,7 +193,7 @@ class InfBuildData(ModuleBuildClassObject):
 \r
     ## Retrieve all information in [Defines] section\r
     #\r
-    #   (Retriving all [Defines] information in one-shot is just to save time.)\r
+    #   (Retrieving all [Defines] information in one-shot is just to save time.)\r
     #\r
     @cached_class_function\r
     def _GetHeaderInfo(self):\r
@@ -667,9 +655,6 @@ class InfBuildData(ModuleBuildClassObject):
     @cached_property\r
     def Includes(self):\r
         RetVal = []\r
-        if self._SourceOverridePath:\r
-            RetVal.append(self._SourceOverridePath)\r
-\r
         Macros = self._Macros\r
         Macros['PROCESSOR'] = GlobalData.gEdkGlobal.get('PROCESSOR', self._Arch)\r
         RecordList = self._RawData[MODEL_EFI_INCLUDE, self._Arch, self._Platform]\r
@@ -816,7 +801,7 @@ class InfBuildData(ModuleBuildClassObject):
             RetVal[Arch, ModuleType] = TemporaryDictionary[Arch, ModuleType]\r
         return RetVal\r
 \r
-    ## Retrieve depedency expression\r
+    ## Retrieve dependency expression\r
     @cached_property\r
     def DepexExpression(self):\r
         RetVal = tdict(False, 2)\r