--- a/sbsv2/raptor/RELEASE-NOTES.txt Mon Feb 22 14:40:46 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt Tue Feb 23 11:25:17 2010 +0000
@@ -2,14 +2,11 @@
next version
-- Fix platform macros for cross compilation on Linux
-- New build win32 tools on Linux.
- To enable it, use variant '.win32'. To build both windows and linux binaries,
- use:
- -c tools2.win32 -c tools2
- It only applies to platform tools2 on Linux
-
-- Add a workaround to enable the Qt team to link their code against Symbian DLL's
+New Features:
+- New support for cross-compiling win32 tools on Linux.
+ To enable it, use "sbs -c tools2.win32 -c tools2" on Linux
+- New workaround to enable the Qt team to link their code against Symbian DLL's
+- New prototype support for reading System Definition v3 files
version 2.12.2
--- a/sbsv2/raptor/python/raptor_xml.py Mon Feb 22 14:40:46 2010 +0000
+++ b/sbsv2/raptor/python/raptor_xml.py Tue Feb 23 11:25:17 2010 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2007-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"
@@ -158,7 +158,7 @@
def GetSystemDefinitionBase(self):
return self.__SystemDefinitionBase
- def GetSystemDefinitionFile(self):
+ def GetSystemDefinitionVersion(self):
return self.__SystemDefinitionVersion
def GetLayerName(self):
@@ -166,7 +166,7 @@
def GetContainerName(self, aContainerType):
if self.__ContainerNames.has_key(aContainerType):
- return self.__ContainerNames[aContainerType]
+ return self.__ContainerNames[aContainerType]
return ""
@@ -297,7 +297,7 @@
# 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 == "systemModel" or child.localName == "layer" or child.localName == "package" or child.localName == "collection" or child.localName == "component":
+ if child.localName in ["systemModel", "layer", "package", "collection", "component"]:
self.__ProcessSystemModelElement(child)
def __CreateComponent(self, aBldInfFile, aUnitElement):