BaseTools: Remove the logic SourceOverridePath

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
SOURCE_OVERRIDE_PATH is for EDK component INF files.
The corresponding logic should be removed.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 568d535754692512e8704f7617d309c3efe2a723..8c7c20a3860e927c6b68ed09cc9ab2a6d3f4fa93 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1141,7 +1141,6 @@ class PlatformAutoGen(AutoGen):
         self.BuildTarget = Target\r
         self.Arch = Arch\r
         self.SourceDir = PlatformFile.SubDir\r
-        self.SourceOverrideDir = None\r
         self.FdTargetList = self.Workspace.FdTargetList\r
         self.FvTargetList = self.Workspace.FvTargetList\r
         # get the original module/package/platform objects\r
@@ -2559,11 +2558,6 @@ class ModuleAutoGen(AutoGen):
         self.SourceDir = self.MetaFile.SubDir\r
         self.SourceDir = mws.relpath(self.SourceDir, self.WorkspaceDir)\r
 \r
-        self.SourceOverrideDir = None\r
-        # use overridden path defined in DSC file\r
-        if self.MetaFile.Key in GlobalData.gOverrideDir:\r
-            self.SourceOverrideDir = GlobalData.gOverrideDir[self.MetaFile.Key]\r
-\r
         self.ToolChain = Toolchain\r
         self.BuildTarget = Target\r
         self.Arch = Arch\r
@@ -2768,12 +2762,7 @@ class ModuleAutoGen(AutoGen):
         RetVal = {}\r
         for Type in self.Module.CustomMakefile:\r
             MakeType = gMakeTypeMap[Type] if Type in gMakeTypeMap else 'nmake'\r
-            if self.SourceOverrideDir is not None:\r
-                File = os.path.join(self.SourceOverrideDir, self.Module.CustomMakefile[Type])\r
-                if not os.path.exists(File):\r
-                    File = os.path.join(self.SourceDir, self.Module.CustomMakefile[Type])\r
-            else:\r
-                File = os.path.join(self.SourceDir, self.Module.CustomMakefile[Type])\r
+            File = os.path.join(self.SourceDir, self.Module.CustomMakefile[Type])\r
             RetVal[MakeType] = File\r
         return RetVal\r
 \r

diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/Python/Common/DataType.py
index 798c0e353df6227ffeb3ae031bd96467d5bc1360..685f42886245429272a73605475ed1da44590fa7 100644 (file)
--- a/BaseTools/Source/Python/Common/DataType.py
+++ b/BaseTools/Source/Python/Common/DataType.py
@@ -306,8 +306,6 @@ TAB_COMPONENTS_ARM = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_ARM
 TAB_COMPONENTS_EBC = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_EBC\r
 TAB_COMPONENTS_AARCH64 = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_AARCH64\r
 \r
-TAB_COMPONENTS_SOURCE_OVERRIDE_PATH = 'SOURCE_OVERRIDE_PATH'\r
-\r
 TAB_BUILD_OPTIONS = 'BuildOptions'\r
 \r
 TAB_DEFINE = 'DEFINE'\r

diff --git a/BaseTools/Source/Python/Common/GlobalData.py b/BaseTools/Source/Python/Common/GlobalData.py
index f117998b0b9c48443c0803937b303da67eec19a4..79b21324dea843da45594bacf3e061cfaee7b229 100644 (file)
--- a/BaseTools/Source/Python/Common/GlobalData.py
+++ b/BaseTools/Source/Python/Common/GlobalData.py
@@ -29,7 +29,6 @@ gPlatformOtherPcds = {}
 gActivePlatform = None\r
 gCommandLineDefines = {}\r
 gEdkGlobal = {}\r
-gOverrideDir = {}\r
 gCommandMaxLength = 4096\r
 # for debug trace purpose when problem occurs\r
 gProcessingFile = ''\r

diff --git a/BaseTools/Source/Python/CommonDataClass/DataClass.py b/BaseTools/Source/Python/CommonDataClass/DataClass.py
index 2d93f79b09ec58c6c8f8600344bc54c982b895f1..5d0c664f6d24cd270c2ed2f9cee8d8a50ec56b89 100644 (file)
--- a/BaseTools/Source/Python/CommonDataClass/DataClass.py
+++ b/BaseTools/Source/Python/CommonDataClass/DataClass.py
@@ -105,7 +105,6 @@ MODEL_META_DATA_PACKAGE = 5011
 MODEL_META_DATA_NMAKE = 5012\r
 MODEL_META_DATA_CONDITIONAL_STATEMENT_ELSEIF = 5013\r
 MODEL_META_DATA_CONDITIONAL_STATEMENT_ENDIF = 5014\r
-MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH = 5015\r
 MODEL_META_DATA_COMMENT = 5016\r
 MODEL_META_DATA_GLOBAL_DEFINE = 5017\r
 MODEL_META_DATA_SECTION_HEADER = 5100\r
@@ -177,7 +176,6 @@ MODEL_LIST = [('MODEL_UNKNOWN', MODEL_UNKNOWN),
               ("MODEL_META_DATA_CONDITIONAL_STATEMENT_IFDEF", MODEL_META_DATA_CONDITIONAL_STATEMENT_IFDEF),\r
               ("MODEL_META_DATA_CONDITIONAL_STATEMENT_IFNDEF", MODEL_META_DATA_CONDITIONAL_STATEMENT_IFNDEF),\r
               ("MODEL_META_DATA_CONDITIONAL_STATEMENT_ERROR", MODEL_META_DATA_CONDITIONAL_STATEMENT_ERROR),\r
-              ("MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH", MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH),\r
               ("MODEL_META_DATA_BUILD_OPTION", MODEL_META_DATA_BUILD_OPTION),\r
               ("MODEL_META_DATA_COMPONENT", MODEL_META_DATA_COMPONENT),\r
               ('MODEL_META_DATA_USER_EXTENSION', MODEL_META_DATA_USER_EXTENSION),\r

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index 862974894a6d9c08f923f91c7e80c8e8ba449887..8ff95ca3bbd8031f090dc44cdc54ea33282dc7fb 100644 (file)
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -739,7 +739,6 @@ class DscParser(MetaFileParser):
         TAB_PCDS_DYNAMIC_EX_HII_NULL.upper()        :   MODEL_PCD_DYNAMIC_EX_HII,\r
         TAB_PCDS_DYNAMIC_EX_VPD_NULL.upper()        :   MODEL_PCD_DYNAMIC_EX_VPD,\r
         TAB_COMPONENTS.upper()                      :   MODEL_META_DATA_COMPONENT,\r
-        TAB_COMPONENTS_SOURCE_OVERRIDE_PATH.upper() :   MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH,\r
         TAB_DSC_DEFINES.upper()                     :   MODEL_META_DATA_HEADER,\r
         TAB_DSC_DEFINES_DEFINE                      :   MODEL_META_DATA_DEFINE,\r
         TAB_DSC_DEFINES_EDKGLOBAL                   :   MODEL_META_DATA_GLOBAL_DEFINE,\r
@@ -1072,8 +1071,6 @@ class DscParser(MetaFileParser):
 \r
         self._ValueList[0:len(TokenList)] = TokenList\r
 \r
-    def _CompponentSourceOverridePathParser(self):\r
-        self._ValueList[0] = self._CurrentLine\r
 \r
     ## [BuildOptions] section parser\r
     @ParseMacro\r
@@ -1138,7 +1135,6 @@ class DscParser(MetaFileParser):
             MODEL_PCD_DYNAMIC_EX_HII                        :   self.__ProcessPcd,\r
             MODEL_PCD_DYNAMIC_EX_VPD                        :   self.__ProcessPcd,\r
             MODEL_META_DATA_COMPONENT                       :   self.__ProcessComponent,\r
-            MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH  :   self.__ProcessSourceOverridePath,\r
             MODEL_META_DATA_BUILD_OPTION                    :   self.__ProcessBuildOption,\r
             MODEL_UNKNOWN                                   :   self._Skip,\r
             MODEL_META_DATA_USER_EXTENSION                  :   self._Skip,\r
@@ -1437,9 +1433,6 @@ class DscParser(MetaFileParser):
     def __ProcessComponent(self):\r
         self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros)\r
 \r
-    def __ProcessSourceOverridePath(self):\r
-        self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros)\r
-\r
     def __ProcessBuildOption(self):\r
         self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=False)\r
                            for Value in self._ValueList]\r
@@ -1459,7 +1452,6 @@ class DscParser(MetaFileParser):
         MODEL_PCD_DYNAMIC_EX_HII                        :   _PcdParser,\r
         MODEL_PCD_DYNAMIC_EX_VPD                        :   _PcdParser,\r
         MODEL_META_DATA_COMPONENT                       :   _ComponentParser,\r
-        MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH  :   _CompponentSourceOverridePathParser,\r
         MODEL_META_DATA_BUILD_OPTION                    :   _BuildOptionParser,\r
         MODEL_UNKNOWN                                   :   MetaFileParser._Skip,\r
         MODEL_META_DATA_USER_EXTENSION                  :   MetaFileParser._Skip,\r

diff --git a/BaseTools/Source/Python/Eot/EotMain.py b/BaseTools/Source/Python/Eot/EotMain.py
index 4802aea8b1fb21e803240dc34532631920cdc529..1cf84d24654a2d42e2ef03c792be40c1fd744be1 100644 (file)
--- a/BaseTools/Source/Python/Eot/EotMain.py
+++ b/BaseTools/Source/Python/Eot/EotMain.py
@@ -1597,7 +1597,7 @@ class Eot(object):
             if not InfFile:\r
                 continue\r
             EdkLogger.quiet("Parsing %s ..."  % str(InfFile))\r
-            EdkInfParser(InfFile, EotGlobalData.gDb, Inf_Files[InfFile], '')\r
+            EdkInfParser(InfFile, EotGlobalData.gDb, Inf_Files[InfFile])\r
 \r
         EotGlobalData.gDb.Conn.commit()\r
         EdkLogger.quiet("Building database for meta data files done!")\r

diff --git a/BaseTools/Source/Python/Eot/InfParserLite.py b/BaseTools/Source/Python/Eot/InfParserLite.py
index cec083330b18bcd4e8c9a83a60c2678222d2f86e..bc575a642c8229be3c3dbd7f11df3926b0bd0f5c 100644 (file)
--- a/BaseTools/Source/Python/Eot/InfParserLite.py
+++ b/BaseTools/Source/Python/Eot/InfParserLite.py
@@ -40,11 +40,8 @@ class EdkInfParser(object):
     #  @param  Filename: INF file name\r
     #  @param  Database: Eot database\r
     #  @param  SourceFileList: A list for all source file belonging this INF file\r
-    #  @param  SourceOverridePath: Override path for source file\r
-    #  @param  Edk_Source: Environment variable EDK_SOURCE\r
-    #  @param  Efi_Source: Environment variable EFI_SOURCE\r
     #\r
-    def __init__(self, Filename = None, Database = None, SourceFileList = None, SourceOverridePath = None, Edk_Source = None, Efi_Source = None):\r
+    def __init__(self, Filename = None, Database = None, SourceFileList = None):\r
         self.Identification = Identification()\r
         self.Sources = []\r
         self.Macros = {}\r
@@ -53,7 +50,6 @@ class EdkInfParser(object):
         self.TblFile = Database.TblFile\r
         self.TblInf = Database.TblInf\r
         self.FileID = -1\r
-        self.SourceOverridePath = SourceOverridePath\r
 \r
         # Load Inf file if filename is not None\r
         if Filename is not None:\r

diff --git a/BaseTools/Source/Python/UPT/Library/DataType.py b/BaseTools/Source/Python/UPT/Library/DataType.py
index 07673694b2d718b6bab4528d1dc4b6c41faf8b3e..175b5f5f36ffeab2c7a4fe32b353c6f8a433ffc1 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/DataType.py
+++ b/BaseTools/Source/Python/UPT/Library/DataType.py
@@ -672,8 +672,6 @@ TAB_COMPONENTS_IPF = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_IPF
 TAB_COMPONENTS_ARM = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_ARM\r
 TAB_COMPONENTS_EBC = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_EBC\r
 \r
-TAB_COMPONENTS_SOURCE_OVERRIDE_PATH = 'SOURCE_OVERRIDE_PATH'\r
-\r
 TAB_BUILD_OPTIONS = 'BuildOptions'\r
 \r
 TAB_DEFINE = 'DEFINE'\r
@@ -943,7 +941,6 @@ MODEL_META_DATA_PACKAGE = 5011
 MODEL_META_DATA_NMAKE = 5012\r
 MODEL_META_DATA_CONDITIONAL_STATEMENT_ELSEIF = 50013\r
 MODEL_META_DATA_CONDITIONAL_STATEMENT_ENDIF = 5014\r
-MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH = 5015\r
 \r
 TOOL_FAMILY_LIST = ["MSFT",\r
                     "INTEL",\r

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index b82af49236a132cb3145dcc3133a30f122da6633..3213855e70661bee2425ceb480723bb209ae6c42 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -413,7 +413,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

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 5e7d7dcd63fb51a90b387f68e608fc74c7b744f8..58286159db8dad1b63e7bfd71ed5d54597a1a40d 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -248,7 +248,6 @@ class DscBuildData(PlatformBuildClassObject):
         self._Toolchain = Toolchain\r
         self._ToolChainFamily = None\r
         self._Clear()\r
-        self._HandleOverridePath()\r
         self.WorkspaceDir = os.getenv("WORKSPACE") if os.getenv("WORKSPACE") else ""\r
         self.DefaultStores = None\r
         self.SkuIdMgr = SkuClass(self.SkuName, self.SkuIds)\r
@@ -307,24 +306,6 @@ class DscBuildData(PlatformBuildClassObject):
         self._MacroDict         = None\r
         self.DefaultStores      = None\r
 \r
-    ## handle Override Path of Module\r
-    def _HandleOverridePath(self):\r
-        RecordList = self._RawData[MODEL_META_DATA_COMPONENT, self._Arch]\r
-        for Record in RecordList:\r
-            ModuleId = Record[6]\r
-            LineNo = Record[7]\r
-            ModuleFile = PathClass(NormPath(Record[0]), GlobalData.gWorkspace, Arch=self._Arch)\r
-            RecordList = self._RawData[MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH, self._Arch, None, ModuleId]\r
-            if RecordList != []:\r
-                SourceOverridePath = mws.join(GlobalData.gWorkspace, NormPath(RecordList[0][0]))\r
-\r
-                # Check if the source override path exists\r
-                if not os.path.isdir(SourceOverridePath):\r
-                    EdkLogger.error('build', FILE_NOT_FOUND, Message='Source override path does not exist:', File=self.MetaFile, ExtraData=SourceOverridePath, Line=LineNo)\r
-\r
-                # Add to GlobalData Variables\r
-                GlobalData.gOverrideDir[ModuleFile.Key] = SourceOverridePath\r
-\r
     ## Get current effective macros\r
     @property\r
     def _Macros(self):\r

diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py
index 6148ab0d30fec68cd9140d3df86ca9a40f38cb48..9fed1198fd9b9213fffb6ada538c989649978dae 100644 (file)
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -100,9 +100,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 +133,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
@@ -667,9 +661,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

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index e5fb3f54731786c3402e1f65dc2ac1856f738ac0..519d30013caf749346aae028c01d2676f85933c2 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -864,7 +864,6 @@ class DscParser(MetaFileParser):
         TAB_PCDS_DYNAMIC_EX_HII_NULL.upper()        :   MODEL_PCD_DYNAMIC_EX_HII,\r
         TAB_PCDS_DYNAMIC_EX_VPD_NULL.upper()        :   MODEL_PCD_DYNAMIC_EX_VPD,\r
         TAB_COMPONENTS.upper()                      :   MODEL_META_DATA_COMPONENT,\r
-        TAB_COMPONENTS_SOURCE_OVERRIDE_PATH.upper() :   MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH,\r
         TAB_DSC_DEFINES.upper()                     :   MODEL_META_DATA_HEADER,\r
         TAB_DSC_DEFINES_DEFINE                      :   MODEL_META_DATA_DEFINE,\r
         TAB_DSC_DEFINES_EDKGLOBAL                   :   MODEL_META_DATA_GLOBAL_DEFINE,\r
@@ -1292,8 +1291,6 @@ class DscParser(MetaFileParser):
 \r
         self._ValueList[0:len(TokenList)] = TokenList\r
 \r
-    def _CompponentSourceOverridePathParser(self):\r
-        self._ValueList[0] = self._CurrentLine\r
 \r
     ## [BuildOptions] section parser\r
     @ParseMacro\r
@@ -1368,7 +1365,6 @@ class DscParser(MetaFileParser):
             MODEL_PCD_DYNAMIC_EX_HII                        :   self.__ProcessPcd,\r
             MODEL_PCD_DYNAMIC_EX_VPD                        :   self.__ProcessPcd,\r
             MODEL_META_DATA_COMPONENT                       :   self.__ProcessComponent,\r
-            MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH  :   self.__ProcessSourceOverridePath,\r
             MODEL_META_DATA_BUILD_OPTION                    :   self.__ProcessBuildOption,\r
             MODEL_UNKNOWN                                   :   self._Skip,\r
             MODEL_META_DATA_USER_EXTENSION                  :   self._SkipUserExtension,\r
@@ -1703,9 +1699,6 @@ class DscParser(MetaFileParser):
     def __ProcessComponent(self):\r
         self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros)\r
 \r
-    def __ProcessSourceOverridePath(self):\r
-        self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros)\r
-\r
     def __ProcessBuildOption(self):\r
         self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=False)\r
                            for Value in self._ValueList]\r
@@ -1731,7 +1724,6 @@ class DscParser(MetaFileParser):
         MODEL_PCD_DYNAMIC_EX_HII                        :   _PcdParser,\r
         MODEL_PCD_DYNAMIC_EX_VPD                        :   _PcdParser,\r
         MODEL_META_DATA_COMPONENT                       :   _ComponentParser,\r
-        MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH  :   _CompponentSourceOverridePathParser,\r
         MODEL_META_DATA_BUILD_OPTION                    :   _BuildOptionParser,\r
         MODEL_UNKNOWN                                   :   MetaFileParser._Skip,\r
         MODEL_META_DATA_USER_EXTENSION                  :   MetaFileParser._SkipUserExtension,\r