##\r
# Import Modules\r
#\r
+from __future__ import print_function\r
import Common.LongFilePathOs as os\r
import re\r
import copy\r
from Common.GlobalData import *\r
from Common.BuildToolError import *\r
from Common.Misc import tdict, PathClass\r
-from Common.String import NormPath\r
+from Common.StringUtils import NormPath\r
from Common.DataType import *\r
\r
import Common.EdkLogger as EdkLogger\r
return "%s_LIST" % FileListMacro(FileType)\r
\r
class TargetDescBlock(object):\r
- _Cache_ = {} # {TargetFile : TargetDescBlock object}\r
-\r
- # Factory method\r
- def __new__(Class, Inputs, Outputs, Commands, Dependencies):\r
- if Outputs[0] in Class._Cache_:\r
- Tdb = Class._Cache_[Outputs[0]]\r
- for File in Inputs:\r
- Tdb.AddInput(File)\r
- else:\r
- Tdb = super(TargetDescBlock, Class).__new__(Class)\r
- Tdb._Init(Inputs, Outputs, Commands, Dependencies)\r
- #Class._Cache_[Outputs[0]] = Tdb\r
- return Tdb\r
+ def __init__(self, Inputs, Outputs, Commands, Dependencies):\r
+ self.InitWorker(Inputs, Outputs, Commands, Dependencies)\r
\r
- def _Init(self, Inputs, Outputs, Commands, Dependencies):\r
+ def InitWorker(self, Inputs, Outputs, Commands, Dependencies):\r
self.Inputs = Inputs\r
self.Outputs = Outputs\r
self.Commands = Commands\r
return hash(self.Target.Path)\r
\r
def __eq__(self, Other):\r
- if type(Other) == type(self):\r
+ if isinstance(Other, type(self)):\r
return Other.Target.Path == self.Target.Path\r
else:\r
return str(Other) == self.Target.Path\r
def IsMultipleInput(self):\r
return len(self.Inputs) > 1\r
\r
- @staticmethod\r
- def Renew():\r
- TargetDescBlock._Cache_ = {}\r
-\r
## Class for one build rule\r
#\r
# This represents a build rule which can give out corresponding command list for\r
\r
## constructor\r
#\r
- # @param Input The dictionary represeting input file(s) for a rule\r
- # @param Output The list represeting output file(s) for a rule\r
+ # @param Input The dictionary representing input file(s) for a rule\r
+ # @param Output The list representing output file(s) for a rule\r
# @param Command The list containing commands to generate the output from input\r
#\r
def __init__(self, Type, Input, Output, Command, ExtraDependency=None):\r
self.IncListFileMacro = self.INC_LIST_MACRO\r
\r
self.SourceFileType = Type\r
- # source files listed not in "*" or "?" pattern format\r
+ # source files listed not in TAB_STAR or "?" pattern format\r
if not ExtraDependency:\r
self.ExtraSourceFileList = []\r
else:\r
self.SourceFileExtList = set()\r
for File in Input:\r
Base, Ext = os.path.splitext(File)\r
- if Base.find("*") >= 0:\r
- # There's "*" in the file name\r
+ if Base.find(TAB_STAR) >= 0:\r
+ # There's TAB_STAR in the file name\r
self.IsMultipleInput = True\r
self.GenFileListMacro = True\r
elif Base.find("?") < 0:\r
- # There's no "*" and "?" in file name\r
+ # There's no TAB_STAR and "?" in file name\r
self.ExtraSourceFileList.append(File)\r
continue\r
self.SourceFileExtList.add(Ext)\r
# @param RelativeToDir The relative path of the source file\r
# @param PathSeparator Path separator\r
#\r
- # @retval tuple (Source file in full path, List of individual sourcefiles, Destionation file, List of build commands)\r
+ # @retval tuple (Source file in full path, List of individual sourcefiles, Destination file, List of build commands)\r
#\r
def Apply(self, SourceFile, BuildRuleOrder=None):\r
if not self.CommandList or not self.DestFileList:\r
# Command line should be regenerated since some macros are different\r
#\r
CommandList = self._BuildCommand(BuildRulePlaceholderDict)\r
- TargetDesc._Init([SourceFile], DstFile, CommandList, self.ExtraSourceFileList)\r
+ TargetDesc.InitWorker([SourceFile], DstFile, CommandList, self.ExtraSourceFileList)\r
break\r
else:\r
TargetDesc.AddInput(SourceFile)\r
# @param LineIndex The line number from which the parsing will begin\r
# @param SupportedFamily The list of supported tool chain families\r
#\r
- def __init__(self, File=None, Content=None, LineIndex=0, SupportedFamily=["MSFT", "INTEL", "GCC", "RVCT"]):\r
+ def __init__(self, File=None, Content=None, LineIndex=0, SupportedFamily=[TAB_COMPILER_MSFT, "INTEL", "GCC", "RVCT"]):\r
self.RuleFile = File\r
# Read build rules from file if it's not none\r
if File is not None:\r
# Clean up the line and replace path separator with native one\r
Line = self.RuleContent[Index].strip().replace(self._PATH_SEP, os.path.sep)\r
self.RuleContent[Index] = Line\r
- \r
+\r
# find the build_rule_version\r
- if Line and Line[0] == "#" and Line.find(TAB_BUILD_RULE_VERSION) <> -1:\r
- if Line.find("=") <> -1 and Line.find("=") < (len(Line) - 1) and (Line[(Line.find("=") + 1):]).split():\r
+ if Line and Line[0] == "#" and Line.find(TAB_BUILD_RULE_VERSION) != -1:\r
+ if Line.find("=") != -1 and Line.find("=") < (len(Line) - 1) and (Line[(Line.find("=") + 1):]).split():\r
self._FileVersion = (Line[(Line.find("=") + 1):]).split()[0]\r
# skip empty or comment line\r
if Line == "" or Line[0] == "#":\r
# @param LineIndex The line index of build rule text\r
#\r
def ParseSubSection(self, LineIndex):\r
- # currenly nothing here\r
+ # currently nothing here\r
pass\r
\r
## Placeholder for not supported sections\r
## Merge section information just got into rule database\r
def EndOfSection(self):\r
Database = self.RuleDatabase\r
- # if there's specific toochain family, 'COMMON' doesn't make sense any more\r
+ # if there's specific toolchain family, 'COMMON' doesn't make sense any more\r
if len(self._TotalToolChainFamilySet) > 1 and TAB_COMMON in self._TotalToolChainFamilySet:\r
self._TotalToolChainFamilySet.remove(TAB_COMMON)\r
for Family in self._TotalToolChainFamilySet:\r
#\r
# @param LineIndex The line index of build rule text\r
#\r
- def ParseInputFile(self, LineIndex):\r
+ def ParseInputFileSubSection(self, LineIndex):\r
FileList = [File.strip() for File in self.RuleContent[LineIndex].split(",")]\r
for ToolChainFamily in self._FamilyList:\r
- InputFiles = self._RuleInfo[ToolChainFamily, self._State]\r
- if InputFiles is None:\r
- InputFiles = []\r
- self._RuleInfo[ToolChainFamily, self._State] = InputFiles\r
- InputFiles.extend(FileList)\r
+ if self._RuleInfo[ToolChainFamily, self._State] is None:\r
+ self._RuleInfo[ToolChainFamily, self._State] = []\r
+ self._RuleInfo[ToolChainFamily, self._State].extend(FileList)\r
\r
## Parse <ExtraDependency> sub-section\r
+ ## Parse <OutputFile> sub-section\r
+ ## Parse <Command> sub-section\r
#\r
# @param LineIndex The line index of build rule text\r
#\r
- def ParseCommon(self, LineIndex):\r
+ def ParseCommonSubSection(self, LineIndex):\r
for ToolChainFamily in self._FamilyList:\r
- Items = self._RuleInfo[ToolChainFamily, self._State]\r
- if Items is None:\r
- Items = []\r
- self._RuleInfo[ToolChainFamily, self._State] = Items\r
- Items.append(self.RuleContent[LineIndex])\r
+ if self._RuleInfo[ToolChainFamily, self._State] is None:\r
+ self._RuleInfo[ToolChainFamily, self._State] = []\r
+ self._RuleInfo[ToolChainFamily, self._State].append(self.RuleContent[LineIndex])\r
\r
## Get a build rule via [] operator\r
#\r
# @param FileExt The extension of a file\r
# @param ToolChainFamily The tool chain family name\r
- # @param BuildVersion The build version number. "*" means any rule\r
- # is applicalbe.\r
+ # @param BuildVersion The build version number. TAB_STAR means any rule\r
+ # is applicable.\r
#\r
# @retval FileType The file type string\r
# @retval FileBuildRule The object of FileBuildRule\r
_Section : ParseSection,\r
_SubSectionHeader : ParseSubSectionHeader,\r
_SubSection : ParseSubSection,\r
- _InputFile : ParseInputFile,\r
- _OutputFile : ParseCommon,\r
- _ExtraDependency : ParseCommon,\r
- _Command : ParseCommon,\r
+ _InputFile : ParseInputFileSubSection,\r
+ _OutputFile : ParseCommonSubSection,\r
+ _ExtraDependency : ParseCommonSubSection,\r
+ _Command : ParseCommonSubSection,\r
_UnknownSection : SkipSection,\r
}\r
\r
EdkLogger.Initialize()\r
if len(sys.argv) > 1:\r
Br = BuildRule(sys.argv[1])\r
- print str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "MSFT"][1])\r
- print\r
- print str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "INTEL"][1])\r
- print\r
- print str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "GCC"][1])\r
- print\r
- print str(Br[".ac", "ACPI_TABLE", "IA32", "MSFT"][1])\r
- print\r
- print str(Br[".h", "ACPI_TABLE", "IA32", "INTEL"][1])\r
- print\r
- print str(Br[".ac", "ACPI_TABLE", "IA32", "MSFT"][1])\r
- print\r
- print str(Br[".s", SUP_MODULE_SEC, "IPF", "COMMON"][1])\r
- print\r
- print str(Br[".s", SUP_MODULE_SEC][1])\r
+ print(str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", TAB_COMPILER_MSFT][1]))\r
+ print()\r
+ print(str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "INTEL"][1]))\r
+ print()\r
+ print(str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "GCC"][1]))\r
+ print()\r
+ print(str(Br[".ac", "ACPI_TABLE", "IA32", TAB_COMPILER_MSFT][1]))\r
+ print()\r
+ print(str(Br[".h", "ACPI_TABLE", "IA32", "INTEL"][1]))\r
+ print()\r
+ print(str(Br[".ac", "ACPI_TABLE", "IA32", TAB_COMPILER_MSFT][1]))\r
+ print()\r
+ print(str(Br[".s", SUP_MODULE_SEC, "IPF", "COMMON"][1]))\r
+ print()\r
+ print(str(Br[".s", SUP_MODULE_SEC][1]))\r
\r
projects / mirror_edk2.git / blobdiff