Mercurial Mercurial > oss > FCL > sftools > dev > build / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge fix
authortimothy.murphy@nokia.com
Mon, 22 Feb 2010 19:11:14 +0000
branchfix
changeset 241 c6f095c06fad
parent 240 fbc6a8ad3957 (diff)
parent 238 bd7f12067a47 (current diff)
child 242 e083e4a62655
Merge
--- a/sbsv2/raptor/RELEASE-NOTES.txt	Fri Feb 19 19:01:20 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Mon Feb 22 19:11:14 2010 +0000
@@ -1,10 +1,10 @@
 Release Notes for Symbian Build System v2
 
-- SF Bug 1861 - [Raptor] More helpful console message in case of Error 128 (timeout)
 
 next version
 
 Defect Fixes:
+- SF Bug 1861 - [Raptor] More helpful console message in case of timeouts
 - DPDEF142718 Incremental rebuild fails if dependent files deleted
   --no-depend-generate added to suppress the generation and processing of dependency files
   .DEFAULT target introduced for all non --no-depend-generate and/or --no-depend-include builds
--- a/sbsv2/raptor/python/plugins/filter_terminal.py	Fri Feb 19 19:01:20 2010 +0000
+++ b/sbsv2/raptor/python/plugins/filter_terminal.py	Mon Feb 22 19:11:14 2010 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-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"
--- a/sbsv2/raptor/schema/build/log/1_0.xsd	Fri Feb 19 19:01:20 2010 +0000
+++ b/sbsv2/raptor/schema/build/log/1_0.xsd	Mon Feb 22 19:11:14 2010 +0000
@@ -3,7 +3,7 @@
 
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-			Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+			Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 			All rights reserved.
 			This component and the accompanying materials are made available
 			uunder the terms of the License "Eclipse Public License v1.0"
@@ -60,7 +60,8 @@
 					<xsd:attribute name="name" type="xsd:string"/>
 					<xsd:attribute name="project" type="xsd:string"/>
 					<xsd:attribute name="component" type="xsd:string"/>
-					<xsd:attribute name="forcesuccess" type="xsd:string"/>
+					<xsd:attribute name="flags" type="xsd:string"/>
+					<xsd:attribute name="reason" type="xsd:string"/>
 				</xsd:complexType>
 			</xsd:element>
 		</xsd:sequence>
--- a/sbsv2/raptor/test/smoke_suite/timeout.py	Fri Feb 19 19:01:20 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/timeout.py	Mon Feb 22 19:11:14 2010 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2009-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"
--- a/sbsv2/raptor/util/talon/process.c	Fri Feb 19 19:01:20 2010 +0000
+++ b/sbsv2/raptor/util/talon/process.c	Mon Feb 22 19:11:14 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
--- a/sbsv2/raptor/util/talon/talon.c	Fri Feb 19 19:01:20 2010 +0000
+++ b/sbsv2/raptor/util/talon/talon.c	Mon Feb 22 19:11:14 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
FCL/sftools/dev/build