FCL/sftools/dev/build: comparison sbsv2/raptor/python/raptor.py

equal deleted inserted replaced

-:4fd571a5fb6a
+:f0e42ff3359f
 #
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 		     # to be able to simulate the overall recursive unfurling of a build.
 class Component(ModelNode):
 	"""A group of projects or, in symbian-speak, a bld.inf.
 	"""
-	def __init__(self, filename):
+	def __init__(self, filename, layername="", componentname=""):
 		super(Component,self).__init__(filename)
 		# Assume that components are specified in bld.inf files for now
 		# One day that tyranny might end.
 		self.bldinf = None # Slot for a bldinf object if we spot one later
 		self.bldinf_filename = generic_path.Path.Absolute(filename)
 		self.id = str(self.bldinf_filename)
 		self.exportspecs = []
 		self.depfiles = []
 		self.unfurled = False # We can parse this
+		# Extra metadata optionally supplied with system definition file gathered components
+		self.layername = layername
+		self.componentname = componentname
 	def AddMMP(self, filename):
 		self.children.add(Project(filename))
 class Layer(ModelNode):
-	""" 	Some components that should be built togther
+	""" Some components that should be built togther
 		e.g. a Layer in the system definition.
+		Components that come from system definition files can
+		have extra surrounding metadata that we need to pass
+		on for use in log output.
 	"""
 	def __init__(self, name, componentlist=[]):
 		super(Layer,self).__init__(name)
 		self.name = name
 		for c in componentlist:
-			self.children.add(Component(c))
+			if isinstance(c, raptor_xml.SystemModelComponent):
+				# this component came from a system_definition.xml
+				self.children.add(Component(c, c.GetContainerName("layer"), c.GetContainerName("component")))
+			else:
+				# this is a plain old bld.inf file from the command-line
+				self.children.add(Component(c))
 	def unfurl(self, build):
 		"""Discover the children of this layer. This involves parsing the component MetaData (bld.infs, mmps).
 		Takes a raptor object as a parameter (build), together with a list of Configurations.
 		if build.quiet == True:
 			cli_options += " -q"
 		if build.timing == True:
 			cli_options += " --timing"
+		if build.noDependInclude == True:
+			cli_options += " --no-depend-include"
+		if build.noDependGenerate == True:
+			cli_options += " --no-depend-generate"
 		nc = len(self.children)
 		number_blocks = build.jobs
 		block_size = (nc / number_blocks) + 1
 		self.debugOutput = False
 		self.doExportOnly = False
 		self.doExport = True
 		self.noBuild = False
 		self.noDependInclude = False
+		self.noDependGenerate = False
 		self.projects = set()
 		self.cache = raptor_cache.Cache(self)
 		self.override = {env: str(self.home)}
 		self.targets = []
 		self.noBuild = TrueOrFalse
 		return True
 	def SetNoDependInclude(self, TrueOrFalse):
 		self.noDependInclude = TrueOrFalse
+		return True
+	def SetNoDependGenerate(self, TrueOrFalse):
+		self.noDependGenerate = TrueOrFalse
 		return True
 	def SetKeepGoing(self, TrueOrFalse):
 		self.keepGoing = TrueOrFalse
 		return True

branch	wip
changeset 342	f0e42ff3359f
parent 268	692d9a4eefc4
child 372	e6d6373c0c3a
child 451	153129bf777e