--- a/sbsv2/raptor/python/raptor_xml.py Tue Apr 20 13:41:38 2010 +0100
+++ b/sbsv2/raptor/python/raptor_xml.py Fri Apr 30 10:19:33 2010 +0100
@@ -11,7 +11,7 @@
#
# Contributors:
#
-# Description:
+# Description:
# raptor_xml module
#
@@ -67,15 +67,15 @@
objects = []
fileVersion = build.getAttribute("xsi:schemaLocation")
-
+
# ignore the file it matches the "invalid" schema
if fileVersion.endswith(xsdIgnore):
return objects
-
+
# check that the file matches the expected schema
if not fileVersion.endswith(xsdVersion):
Raptor.Warn("file '%s' uses schema '%s' which does not end with the expected version '%s'", filename, fileVersion, xsdVersion)
-
+
# create a Data Model object from each sub-element
for child in build.childNodes:
if child.namespaceURI == namespace \
@@ -147,21 +147,21 @@
def __init__(self, aBldInfFile, aLayerName, aContainerNames, aSystemDefinitionFile, aSystemDefinitionBase, aSystemDefinitionVersion):
generic_path.Path.__init__(self, aBldInfFile.Absolute().path)
self.__ContainerNames = aContainerNames
- self.__LayerName = aLayerName
+ self.__LayerName = aLayerName
self.__SystemDefinitionFile = aSystemDefinitionFile
- self.__SystemDefinitionBase = aSystemDefinitionBase
- self.__SystemDefinitionVersion = aSystemDefinitionVersion
+ self.__SystemDefinitionBase = aSystemDefinitionBase
+ self.__SystemDefinitionVersion = aSystemDefinitionVersion
def GetSystemDefinitionFile(self):
return self.__SystemDefinitionFile
def GetSystemDefinitionBase(self):
return self.__SystemDefinitionBase
-
- def GetSystemDefinitionVersion(self):
- return self.__SystemDefinitionVersion
-
- def GetLayerName(self):
+
+ def GetSystemDefinitionVersion(self):
+ return self.__SystemDefinitionVersion
+
+ def GetLayerName(self):
return self.__LayerName
def GetContainerName(self, aContainerType):
@@ -177,12 +177,13 @@
self.__Logger = aLogger
self.__SystemDefinitionFile = aSystemDefinitionFile.GetLocalString()
self.__SystemDefinitionBase = aSystemDefinitionBase.GetLocalString()
- self.__Version = {'MAJOR':0,'MID':0,'MINOR':0}
- self.__IdAttribute = "name"
+ self.__Version = {'MAJOR':0,'MID':0,'MINOR':0}
+ self.__IdAttribute = "name"
self.__ComponentRoot = ""
self.__TotalComponents = 0
self.__LayerList = []
self.__LayerDetails = {}
+ self.__MissingBldInfs = {}
self.__DOM = None
self.__SystemDefinitionElement = None
@@ -208,10 +209,16 @@
return self.__LayerDetails[aLayer]
def IsLayerBuildable(self, aLayer):
+ if aLayer in self.__MissingBldInfs:
+ for missingbldinf in self.__MissingBldInfs[aLayer]:
+ self.__Logger.Error("System Definition layer \"%s\" from system definition file \"%s\" " + \
+ "refers to non existent bld.inf file %s", aLayer, self.__SystemDefinitionFile, missingbldinf)
+
if len(self.GetLayerComponents(aLayer)):
return True
return False
+
def GetAllComponents(self):
components = []
@@ -268,33 +275,33 @@
if self.__Version['MAJOR'] == 1 and self.__Version['MID'] > 2:
self.__ComponentRoot = self.__SystemDefinitionBase
- elif self.__Version['MAJOR'] == 2 or self.__Version['MAJOR'] == 3:
- # 2.0.x and 3.0.0 formats support SOURCEROOT or SRCROOT as an environment specified base - we respect this, unless
- # explicitly overridden on the command line
- if os.environ.has_key('SRCROOT'):
- self.__ComponentRoot = generic_path.Path(os.environ['SRCROOT'])
- elif os.environ.has_key('SOURCEROOT'):
+ elif self.__Version['MAJOR'] == 2 or self.__Version['MAJOR'] == 3:
+ # 2.0.x and 3.0.0 formats support SOURCEROOT or SRCROOT as an environment specified base - we respect this, unless
+ # explicitly overridden on the command line
+ if os.environ.has_key('SRCROOT'):
+ self.__ComponentRoot = generic_path.Path(os.environ['SRCROOT'])
+ elif os.environ.has_key('SOURCEROOT'):
self.__ComponentRoot = generic_path.Path(os.environ['SOURCEROOT'])
-
- if self.__SystemDefinitionBase and self.__SystemDefinitionBase != ".":
- self.__ComponentRoot = self.__SystemDefinitionBase
- if os.environ.has_key('SRCROOT'):
- self.__Logger.Info("Command line specified System Definition file base \'%s\' overriding environment SRCROOT \'%s\'", self.__SystemDefinitionBase, os.environ['SRCROOT'])
- elif os.environ.has_key('SOURCEROOT'):
- self.__Logger.Info("Command line specified System Definition file base \'%s\' overriding environment SOURCEROOT \'%s\'", self.__SystemDefinitionBase, os.environ['SOURCEROOT'])
+
+ if self.__SystemDefinitionBase and self.__SystemDefinitionBase != ".":
+ self.__ComponentRoot = self.__SystemDefinitionBase
+ if os.environ.has_key('SRCROOT'):
+ self.__Logger.Info("Command line specified System Definition file base \'%s\' overriding environment SRCROOT \'%s\'", self.__SystemDefinitionBase, os.environ['SRCROOT'])
+ elif os.environ.has_key('SOURCEROOT'):
+ self.__Logger.Info("Command line specified System Definition file base \'%s\' overriding environment SOURCEROOT \'%s\'", self.__SystemDefinitionBase, os.environ['SOURCEROOT'])
else:
self.__Logger.Error("Cannot process schema version %s of file %s", version.string, self.__SystemDefinitionFile)
return False
-
- if self.__Version['MAJOR'] >= 3:
- # id is the unique identifier for 3.0 and later schema
- self.__IdAttribute = "id"
+
+ if self.__Version['MAJOR'] >= 3:
+ # id is the unique identifier for 3.0 and later schema
+ self.__IdAttribute = "id"
return True
def __Parse(self):
# For 2.0 and earlier: find the <systemModel> element (there can be 0 or 1) and search any <layer> elements for <unit> elements with "bldFile" attributes
- # the <layer> context of captured "bldFile" attributes is recorded as we go
+ # the <layer> context of captured "bldFile" attributes is recorded as we go
# For 3.0 and later, process any architectural topmost element, use the topmost element with an id as the "layer"
for child in self.__SystemDefinitionElement.childNodes:
if child.localName in ["systemModel", "layer", "package", "collection", "component"]:
@@ -303,20 +310,20 @@
def __CreateComponent(self, aBldInfFile, aUnitElement):
# take a resolved bld.inf file and associated <unit/> element and returns a populated Component object
containers = {}
- self.__GetElementContainers(aUnitElement, containers)
+ self.__GetElementContainers(aUnitElement, containers)
layer = self.__GetEffectiveLayer(aUnitElement)
component = SystemModelComponent(aBldInfFile, layer, containers, self.__SystemDefinitionFile, self.__SystemDefinitionBase, self.__Version)
return component
-
- def __GetEffectiveLayer(self, aElement):
- #' return the ID of the topmost item which has an ID. For 1.x and 2.x, this will always be layer, for 3.x, it will be the topmost ID'd element in the file
- # never call this on the root element
- if aElement.parentNode.hasAttribute(self.__IdAttribute):
- return self.__GetEffectiveLayer(aElement.parentNode)
- elif aElement.hasAttribute(self.__IdAttribute):
- return aElement.getAttribute(self.__IdAttribute)
- return ""
+
+ def __GetEffectiveLayer(self, aElement):
+ #' return the ID of the topmost item which has an ID. For 1.x and 2.x, this will always be layer, for 3.x, it will be the topmost ID'd element in the file
+ # never call this on the root element
+ if aElement.parentNode.hasAttribute(self.__IdAttribute):
+ return self.__GetEffectiveLayer(aElement.parentNode)
+ elif aElement.hasAttribute(self.__IdAttribute):
+ return aElement.getAttribute(self.__IdAttribute)
+ return ""
def __GetElementContainers(self, aElement, aContainers):
# take a <unit/> element and creates a type->name dictionary of all of its parent containers
@@ -333,7 +340,7 @@
def __ProcessSystemModelElement(self, aElement):
"""Search for XML <unit/> elements with 'bldFile' attributes and resolve concrete bld.inf locations
with an appreciation of different schema versions."""
-
+
# The effective "layer" is the item whose parent does not have an id (or name in 2.x and earlier)
if not aElement.parentNode.hasAttribute(self.__IdAttribute) :
currentLayer = aElement.getAttribute(self.__IdAttribute)
@@ -368,19 +375,26 @@
group = generic_path.Path(bldFileValue)
- if self.__Version['MAJOR'] < 3:
- # absolute paths are not changed by root var in 1.x and 2.x
+ if self.__Version['MAJOR'] < 3:
+ # absolute paths are not changed by root var in 1.x and 2.x
if not group.isAbsolute() and bldInfRoot:
- group = generic_path.Join(bldInfRoot, group)
- else:
- # only absolute paths are changed by root var in 3.x
- if group.isAbsolute() and bldInfRoot:
- group = generic_path.Join(bldInfRoot, group)
+ group = generic_path.Join(bldInfRoot, group)
+ else:
+ # only absolute paths are changed by root var in 3.x
+ if group.isAbsolute() and bldInfRoot:
+ group = generic_path.Join(bldInfRoot, group)
bldinf = generic_path.Join(group, "bld.inf").FindCaseless()
if bldinf == None:
- self.__Logger.Error("No bld.inf found at %s in %s", group.GetLocalString(), self.__SystemDefinitionFile)
+ # recording layers containing non existent bld.infs
+ bldinfname = group.GetLocalString()
+ bldinfname = bldinfname + 'bld.inf'
+ layer = self.__GetEffectiveLayer(aElement)
+ if not layer in self.__MissingBldInfs:
+ self.__MissingBldInfs[layer]=[]
+ self.__MissingBldInfs[layer].append(bldinfname)
+
else:
component = self.__CreateComponent(bldinf, aElement)
layer = component.GetLayerName()