REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3653
The "target.txt" and "tools_def.txt" filenames are hard-coded
at some places when global definitions are available at:
BaseTools/Source/Python/Common/TargetTxtClassObject.py:
DefaultTargetTxtFile
and
BaseTools/Source/Python/Common/ToolDefClassObject.py:
DefaultToolsDefFile
Use these global definitions instead.
Also remove the unused gBuildConfiguration and gToolsDefinition
variables from build.py
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Chris Jones <christopher.jones@arm.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
from io import BytesIO\r
\r
import Common.LongFilePathOs as os\r
from io import BytesIO\r
\r
import Common.LongFilePathOs as os\r
-from Common.TargetTxtClassObject import TargetTxtDict\r
+from Common.TargetTxtClassObject import TargetTxtDict,gDefaultTargetTxtFile\r
from Common.DataType import *\r
import Common.GlobalData as GlobalData\r
from Common import EdkLogger\r
from Common.DataType import *\r
import Common.GlobalData as GlobalData\r
from Common import EdkLogger\r
GenFdsGlobalVariable.ConfDir = ConfDirectoryPath\r
if not GlobalData.gConfDirectory:\r
GlobalData.gConfDirectory = GenFdsGlobalVariable.ConfDir\r
GenFdsGlobalVariable.ConfDir = ConfDirectoryPath\r
if not GlobalData.gConfDirectory:\r
GlobalData.gConfDirectory = GenFdsGlobalVariable.ConfDir\r
- BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, "target.txt"))\r
+ BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, gDefaultTargetTxtFile))\r
if os.path.isfile(BuildConfigurationFile) == True:\r
# if no build target given in command line, get it from target.txt\r
TargetObj = TargetTxtDict()\r
if os.path.isfile(BuildConfigurationFile) == True:\r
# if no build target given in command line, get it from target.txt\r
TargetObj = TargetTxtDict()\r
from Common.Misc import SaveFileOnChange\r
\r
from Common.TargetTxtClassObject import TargetTxtDict\r
from Common.Misc import SaveFileOnChange\r
\r
from Common.TargetTxtClassObject import TargetTxtDict\r
-from Common.ToolDefClassObject import ToolDefDict\r
+from Common.ToolDefClassObject import ToolDefDict,gDefaultToolsDefFile\r
from AutoGen.BuildEngine import ToolBuildRule\r
import Common.DataType as DataType\r
from Common.Misc import PathClass,CreateDirectory\r
from AutoGen.BuildEngine import ToolBuildRule\r
import Common.DataType as DataType\r
from Common.Misc import PathClass,CreateDirectory\r
TargetObj = TargetTxtDict()\r
ToolDefinitionFile = TargetObj.Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
if ToolDefinitionFile == '':\r
TargetObj = TargetTxtDict()\r
ToolDefinitionFile = TargetObj.Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
if ToolDefinitionFile == '':\r
- ToolDefinitionFile = "Conf/tools_def.txt"\r
+ ToolDefinitionFile = os.path.join('Conf', gDefaultToolsDefFile)\r
if os.path.isfile(ToolDefinitionFile):\r
ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))\r
ToolDefinition = ToolDefObj.ToolDef.ToolsDefTxtDatabase\r
if os.path.isfile(ToolDefinitionFile):\r
ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))\r
ToolDefinition = ToolDefObj.ToolDef.ToolsDefTxtDatabase\r
from Common.DataType import *\r
from Common.BuildVersion import gBUILD_VERSION\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
from Common.DataType import *\r
from Common.BuildVersion import gBUILD_VERSION\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
+from Common.TargetTxtClassObject import gDefaultTargetTxtFile\r
\r
# To Do 1.set clean, 2. add item, if the line is disabled.\r
\r
\r
# To Do 1.set clean, 2. add item, if the line is disabled.\r
\r
self.WorkSpace = os.path.normpath(os.getenv('WORKSPACE'))\r
self.Opt = opt\r
self.Arg = args[0]\r
self.WorkSpace = os.path.normpath(os.getenv('WORKSPACE'))\r
self.Opt = opt\r
self.Arg = args[0]\r
- self.FileName = os.path.normpath(os.path.join(self.WorkSpace, 'Conf', 'target.txt'))\r
+ self.FileName = os.path.normpath(os.path.join(self.WorkSpace, 'Conf', gDefaultTargetTxtFile))\r
if os.path.isfile(self.FileName) == False:\r
print("%s does not exist." % self.FileName)\r
sys.exit(1)\r
if os.path.isfile(self.FileName) == False:\r
print("%s does not exist." % self.FileName)\r
sys.exit(1)\r
from types import *\r
from Common.Expression import *\r
from CommonDataClass.CommonClass import SkuInfoClass\r
from types import *\r
from Common.Expression import *\r
from CommonDataClass.CommonClass import SkuInfoClass\r
-from Common.TargetTxtClassObject import TargetTxtDict\r
-from Common.ToolDefClassObject import ToolDefDict\r
+from Common.TargetTxtClassObject import TargetTxtDict,gDefaultTargetTxtFile\r
+from Common.ToolDefClassObject import ToolDefDict,gDefaultToolsDefFile\r
from .MetaDataTable import *\r
from .MetaFileTable import *\r
from .MetaFileParser import *\r
from .MetaDataTable import *\r
from .MetaFileTable import *\r
from .MetaFileParser import *\r
self._ToolChainFamily = TAB_COMPILER_MSFT\r
TargetObj = TargetTxtDict()\r
TargetTxt = TargetObj.Target\r
self._ToolChainFamily = TAB_COMPILER_MSFT\r
TargetObj = TargetTxtDict()\r
TargetTxt = TargetObj.Target\r
- BuildConfigurationFile = os.path.normpath(os.path.join(GlobalData.gConfDirectory, "target.txt"))\r
+ BuildConfigurationFile = os.path.normpath(os.path.join(GlobalData.gConfDirectory, gDefaultTargetTxtFile))\r
if os.path.isfile(BuildConfigurationFile) == True:\r
ToolDefinitionFile = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
if ToolDefinitionFile == '':\r
if os.path.isfile(BuildConfigurationFile) == True:\r
ToolDefinitionFile = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
if ToolDefinitionFile == '':\r
- ToolDefinitionFile = "tools_def.txt"\r
- ToolDefinitionFile = os.path.normpath(mws.join(self.WorkspaceDir, 'Conf', ToolDefinitionFile))\r
+ ToolDefinitionFile = os.path.normpath(mws.join(self.WorkspaceDir, 'Conf', gDefaultToolsDefFile))\r
if os.path.isfile(ToolDefinitionFile) == True:\r
ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))\r
ToolDefinition = ToolDefObj.ToolDef.ToolsDefTxtDatabase\r
if os.path.isfile(ToolDefinitionFile) == True:\r
ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))\r
ToolDefinition = ToolDefObj.ToolDef.ToolsDefTxtDatabase\r
## standard targets of build command\r
gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run']\r
\r
## standard targets of build command\r
gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run']\r
\r
-## build configuration file\r
-gBuildConfiguration = "target.txt"\r
-gToolsDefinition = "tools_def.txt"\r
-\r
TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$')\r
TmpTableDict = {}\r
\r
TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$')\r
TmpTableDict = {}\r
\r