# HG changeset patch # User timothy.murphy@nokia.com # Date 1267547310 0 # Node ID 15d964981d940601fad8380076a06dcb96a71dd6 # Parent 5190d528364bedad44e7cc65b99ad40c4d915745# Parent 7029b5be2b15190699d0b9e63b6a7b1db496cd67 Merge default back into fix. diff -r 5190d528364b -r 15d964981d94 .hgtags --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgtags Tue Mar 02 16:28:30 2010 +0000 @@ -0,0 +1,3 @@ +1e23e973ab856a45d9e3e2dcd9a72a9e466c03c7 stable +1e23e973ab856a45d9e3e2dcd9a72a9e466c03c7 stable +007900c31eef0363e705cf15d131740d4eeb6208 stable diff -r 5190d528364b -r 15d964981d94 sbsv2/raptor/RELEASE-NOTES.txt --- a/sbsv2/raptor/RELEASE-NOTES.txt Mon Mar 01 16:29:16 2010 +0000 +++ b/sbsv2/raptor/RELEASE-NOTES.txt Tue Mar 02 16:28:30 2010 +0000 @@ -1,8 +1,9 @@ Release Notes for Symbian Build System v2 -next version +version 2.12.4 Defect Fixes: +- SF Bug 2113 - [Raptor] what/check filters can assign files to the wrong components - SF Bug 2081 - [Raptor] - Exported file executable permissions not maintained (linux) - Fix: host attribute in recipes was blank in windows, windows cluster builds. - SF Bug 1912 - Raptor should take python from the path [if not set with SBS_PYTHON or bundled with Raptor] @@ -19,6 +20,12 @@ - Stop copying .bmp files to epoc32/localisation and fix the "what" reporting +version 2.12.3 + +Defect Fixes: +- Don't print trace "what" information if we do not run the trace compiler. + + version 2.12.2 Defect Fixes: diff -r 5190d528364b -r 15d964981d94 sbsv2/raptor/lib/flm/tracecompiler.mk --- a/sbsv2/raptor/lib/flm/tracecompiler.mk Mon Mar 01 16:29:16 2010 +0000 +++ b/sbsv2/raptor/lib/flm/tracecompiler.mk Tue Mar 02 16:28:30 2010 +0000 @@ -89,7 +89,7 @@ ( echo -en "$(TRACE_PRJNAME)\n$(PROJECT_META)\n"; \ $(GNUCAT) $(TRACE_SOURCE_LIST); \ echo -en "*ENDOFSOURCEFILES*\n" ) | \ - $(JAVA_COMMAND) $(TRACE_COMPILER_START) -vb $(UID_TC) && \ + $(JAVA_COMMAND) $(TRACE_COMPILER_START) $(UID_TC) && \ $(GNUMD5SUM) $(TRACE_SOURCE_LIST) > $(TRACE_MARKER) && \ { $(GNUCAT) $(TRACE_SOURCE_LIST) ; true ; } \ $(call endrule,tracecompile) diff -r 5190d528364b -r 15d964981d94 sbsv2/raptor/python/plugins/filter_what.py --- a/sbsv2/raptor/python/plugins/filter_what.py Mon Mar 01 16:29:16 2010 +0000 +++ b/sbsv2/raptor/python/plugins/filter_what.py Tue Mar 02 16:28:30 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" @@ -162,17 +162,16 @@ self.print_file(line, start, end) - else: - "work out what the 'current' bldinf file is" - m = self.whatlog_regex.match(line) - if m: - bi = m.groupdict()['bldinf'] - if self.current_bldinf != bi: - if self.current_bldinf != '': - self.end_bldinf() - self.current_bldinf = bi - if bi != '': - self.start_bldinf(bi) + "work out what the 'current' bldinf file is" + m = self.whatlog_regex.match(line) + if m: + bi = m.groupdict()['bldinf'] + if self.current_bldinf != bi: + if self.current_bldinf != '': + self.end_bldinf() + self.current_bldinf = bi + if bi != '': + self.start_bldinf(bi) diff -r 5190d528364b -r 15d964981d94 sbsv2/raptor/python/raptor_version.py --- a/sbsv2/raptor/python/raptor_version.py Mon Mar 01 16:29:16 2010 +0000 +++ b/sbsv2/raptor/python/raptor_version.py Tue Mar 02 16:28:30 2010 +0000 @@ -16,7 +16,7 @@ # replace CHANGESET with the Hg changeset for ANY release -version=(2,12,2,"2010-02-17","symbian build system","CHANGESET") +version=(2,12,4,"2010-03-03","symbian build system","CHANGESET") def numericversion(): """Raptor version string""" diff -r 5190d528364b -r 15d964981d94 sbsv2/raptor/test/smoke_suite/test_resources/logexamples/what_component_repeated.log --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/logexamples/what_component_repeated.log Tue Mar 02 16:28:30 2010 +0000 @@ -0,0 +1,15 @@ + +/epoc32/data/something + + + + + +/epoc32/release/armv5/something + + + + + +/epoc32/data/something_else + diff -r 5190d528364b -r 15d964981d94 sbsv2/raptor/test/smoke_suite/whatcomp.py --- a/sbsv2/raptor/test/smoke_suite/whatcomp.py Mon Mar 01 16:29:16 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/whatcomp.py Tue Mar 02 16:28:30 2010 +0000 @@ -57,8 +57,8 @@ ] warnings = 0 - t.id = "0106" - t.name = "whatcomp" + t.id = "0106a" + t.name = "whatcomp_basic" t.description = description t.command = command % "arm.v5.urel.gcce4_4_1" t.targets = targets @@ -67,5 +67,27 @@ t.warnings = warnings t.run() + t.id = "0106a" + t.name = "whatcomp_component_repeated" + t.description = """ + It is possible for what information about a component to not be grouped + (i.e. for multiple whatlogs tags relating to a single component to be + interspersed with whatlog tags relating to other components). + Raptor must cope with that and must *not* report missing files under + the wrong component name.""" + t.command = "sbs_filter --filters=FilterWhatComp < smoke_suite/test_resources/logexamples/what_component_repeated.log" + t.targets = [] + t.mustmatch = [] + t.mustmatch_multiline = [ + "Chdir y:.ext.app.emailwizard.*epoc32.data.something.*"+ + "Chdir y:.sf.mw.gsprofilesrv.ftuwizardmodel.*epoc32.release.armv5.something.*"+ + "Chdir y:.ext.app.emailwizard.*epoc32.data.something_else" + ] + + t.mustnotmatch = [] + t.warnings = 0 + t.run() + + t.id = "0106" t.print_result() return t