# build a platform or a module\r
#\r
# Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
-# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# Version and Copyright\r
VersionNumber = "0.60" + ' ' + gBUILD_VERSION\r
__version__ = "%prog Version " + VersionNumber\r
-__copyright__ = "Copyright (c) 2007 - 2016, Intel Corporation All rights reserved."\r
+__copyright__ = "Copyright (c) 2007 - 2017, Intel Corporation All rights reserved."\r
\r
## standard targets of build command\r
gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run']\r
# It could be a string or sequence. We find that if command is a string in following Popen(),\r
# ubuntu may fail with an error message that the command is not found.\r
# So here we may need convert command from string to list instance.\r
- if not isinstance(Command, list):\r
- if platform.system() != 'Windows':\r
+ if platform.system() != 'Windows':\r
+ if not isinstance(Command, list):\r
Command = Command.split()\r
+ Command = ' '.join(Command)\r
\r
Proc = None\r
EndOfProcedure = None\r
try:\r
# launch the command\r
- Proc = Popen(Command, stdout=PIPE, stderr=PIPE, env=os.environ, cwd=WorkingDir, bufsize=-1)\r
+ Proc = Popen(Command, stdout=PIPE, stderr=PIPE, env=os.environ, cwd=WorkingDir, bufsize=-1, shell=True)\r
\r
# launch two threads to read the STDOUT and STDERR\r
EndOfProcedure = Event()\r
# This also handles someone specifying the Conf directory in the workspace. Using --conf=Conf\r
ConfDirectoryPath = mws.join(self.WorkspaceDir, ConfDirectoryPath)\r
else:\r
- # Get standard WORKSPACE/Conf use the absolute path to the WORKSPACE/Conf\r
- ConfDirectoryPath = mws.join(self.WorkspaceDir, 'Conf')\r
+ if "CONF_PATH" in os.environ:\r
+ ConfDirectoryPath = os.path.normcase(os.path.normpath(os.environ["CONF_PATH"]))\r
+ else:\r
+ # Get standard WORKSPACE/Conf use the absolute path to the WORKSPACE/Conf\r
+ ConfDirectoryPath = mws.join(self.WorkspaceDir, 'Conf')\r
GlobalData.gConfDirectory = ConfDirectoryPath\r
GlobalData.gDatabasePath = os.path.normpath(os.path.join(ConfDirectoryPath, GlobalData.gDatabasePath))\r
\r
self.Db = WorkspaceDatabase(GlobalData.gDatabasePath, self.Reparse)\r
self.BuildDatabase = self.Db.BuildObject\r
self.Platform = None\r
+ self.ToolChainFamily = None\r
self.LoadFixAddress = 0\r
self.UniFlag = BuildOptions.Flag\r
self.BuildModules = []\r
if "EDK_TOOLS_BIN" in os.environ:\r
# Print the same path style with WORKSPACE env. \r
EdkLogger.quiet("%-16s = %s" % ("EDK_TOOLS_BIN", os.path.normcase(os.path.normpath(os.environ["EDK_TOOLS_BIN"]))))\r
-\r
+ EdkLogger.quiet("%-16s = %s" % ("CONF_PATH", GlobalData.gConfDirectory))\r
self.InitPreBuild()\r
self.InitPostBuild()\r
if self.PrebuildScript:\r
EdkLogger.quiet("%-16s = %s" % ("POSTBUILD", self.PostbuildScript))\r
if self.PrebuildScript:\r
self.LaunchPrebuild()\r
+ self.TargetTxt = TargetTxtClassObject()\r
+ self.ToolDef = ToolDefClassObject()\r
if not (self.LaunchPrebuildFlag and os.path.exists(self.PlatformBuildPath)):\r
self.InitBuild()\r
\r
else:\r
self.ToolChainList = NewToolChainList\r
\r
+ ToolChainFamily = []\r
+ ToolDefinition = self.ToolDef.ToolsDefTxtDatabase\r
+ for Tool in self.ToolChainList:\r
+ if TAB_TOD_DEFINES_FAMILY not in ToolDefinition or Tool not in ToolDefinition[TAB_TOD_DEFINES_FAMILY] \\r
+ or not ToolDefinition[TAB_TOD_DEFINES_FAMILY][Tool]:\r
+ EdkLogger.warn("No tool chain family found in configuration for %s. Default to MSFT." % Tool)\r
+ ToolChainFamily.append("MSFT")\r
+ else:\r
+ ToolChainFamily.append(ToolDefinition[TAB_TOD_DEFINES_FAMILY][Tool])\r
+ self.ToolChainFamily = ToolChainFamily\r
+\r
if self.ThreadNumber == None:\r
self.ThreadNumber = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER]\r
if self.ThreadNumber == '':\r
if self.ToolChainList:\r
GlobalData.gGlobalDefines['TOOLCHAIN'] = self.ToolChainList[0]\r
GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = self.ToolChainList[0]\r
+ if self.ToolChainFamily:\r
+ GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[0]\r
if 'PREBUILD' in GlobalData.gCommandLineDefines.keys():\r
self.Prebuild = GlobalData.gCommandLineDefines.get('PREBUILD')\r
else:\r
self.PostbuildScript = PostbuildList[0]\r
self.Postbuild = ' '.join(PostbuildList)\r
self.Postbuild += self.PassCommandOption(self.BuildTargetList, self.ArchList, self.ToolChainList)\r
- #self.LanuchPostbuild()\r
else:\r
EdkLogger.error("Postbuild", POSTBUILD_ERROR, "the postbuild script %s is not exist.\n If you'd like to disable the Postbuild process, please use the format: -D POSTBUILD=\"\" " %(PostbuildList[0]))\r
\r
os.remove(self.PlatformBuildPath)\r
if sys.platform == "win32":\r
args = ' && '.join((self.Prebuild, 'set > ' + PrebuildEnvFile))\r
- Process = Popen(args, stdout=PIPE, stderr=PIPE)\r
+ Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True)\r
else:\r
args = ' && '.join((self.Prebuild, 'env > ' + PrebuildEnvFile))\r
- Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True, executable="/bin/bash")\r
+ Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True)\r
\r
# launch two threads to read the STDOUT and STDERR\r
EndOfProcedure = Event()\r
os.environ.update(dict(envs))\r
EdkLogger.info("\n- Prebuild Done -\n")\r
\r
- def LanuchPostbuild(self):\r
+ def LaunchPostbuild(self):\r
if self.Postbuild:\r
EdkLogger.info("\n- Postbuild Start -\n")\r
if sys.platform == "win32":\r
- Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE)\r
+ Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE, shell=True)\r
else:\r
- Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE, shell=True, executable="/bin/bash")\r
+ Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE, shell=True)\r
# launch two threads to read the STDOUT and STDERR\r
EndOfProcedure = Event()\r
EndOfProcedure.clear()\r
if IsIpfPlatform and ImageInfo.Image.Size % 0x2000 != 0:\r
ImageInfo.Image.Size = (ImageInfo.Image.Size / 0x2000 + 1) * 0x2000\r
RtSize += ImageInfo.Image.Size\r
- elif Module.ModuleType in ['SMM_CORE', 'DXE_SMM_DRIVER']:\r
+ elif Module.ModuleType in ['SMM_CORE', 'DXE_SMM_DRIVER', 'MM_STANDALONE', 'MM_CORE_STANDALONE']:\r
SmmModuleList[Module.MetaFile] = ImageInfo\r
SmmSize += ImageInfo.Image.Size\r
if Module.ModuleType == 'DXE_SMM_DRIVER':\r
SaveFileOnChange(self.PlatformBuildPath, '# DO NOT EDIT \n# FILE auto-generated\n', False)\r
for BuildTarget in self.BuildTargetList:\r
GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
+ index = 0\r
for ToolChain in self.ToolChainList:\r
GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
+ GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[index]\r
+ index += 1\r
Wa = WorkspaceAutoGen(\r
self.WorkspaceDir,\r
self.PlatformFile,\r
def _BuildModule(self):\r
for BuildTarget in self.BuildTargetList:\r
GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
+ index = 0\r
for ToolChain in self.ToolChainList:\r
GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
+ GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[index]\r
+ index += 1\r
#\r
# module build needs platform build information, so get platform\r
# AutoGen first\r
MaList = []\r
for Arch in Wa.ArchList:\r
GlobalData.gGlobalDefines['ARCH'] = Arch\r
- Ma = ModuleAutoGen(Wa, self.ModuleFile, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
- if Ma == None: continue\r
- MaList.append(Ma)\r
- self.BuildModules.append(Ma)\r
- if not Ma.IsBinaryModule:\r
- self._Build(self.Target, Ma, BuildModule=True)\r
+ Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
+ for Module in Pa.Platform.Modules:\r
+ if self.ModuleFile.Dir == Module.Dir and self.ModuleFile.File == Module.File:\r
+ Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
+ if Ma == None: continue\r
+ MaList.append(Ma)\r
+ self.BuildModules.append(Ma)\r
+ if not Ma.IsBinaryModule:\r
+ self._Build(self.Target, Ma, BuildModule=True)\r
\r
self.BuildReport.AddPlatformReport(Wa, MaList)\r
if MaList == []:\r
SaveFileOnChange(self.PlatformBuildPath, '# DO NOT EDIT \n# FILE auto-generated\n', False)\r
for BuildTarget in self.BuildTargetList:\r
GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
+ index = 0\r
for ToolChain in self.ToolChainList:\r
GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
+ GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[index]\r
+ index += 1\r
Wa = WorkspaceAutoGen(\r
self.WorkspaceDir,\r
self.PlatformFile,\r
\r
if ReturnCode == 0:\r
try:\r
- MyBuild.LanuchPostbuild()\r
+ MyBuild.LaunchPostbuild()\r
Conclusion = "Done"\r
except:\r
Conclusion = "Failed"\r
projects / mirror_edk2.git / blobdiff