# HG changeset patch # User raptorbot # Date 1266952488 0 # Node ID c1e5ac1e307e462fc734897fefe2eb3b9c9cd16d # Parent 6846d05399b6be0ae557e22390089f50a234503d# Parent 019dafe54c232457e0417c220325202581467025 Merge TimM's bugfixes diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/RELEASE-NOTES.txt --- a/sbsv2/raptor/RELEASE-NOTES.txt Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/RELEASE-NOTES.txt Tue Feb 23 19:14:48 2010 +0000 @@ -1,14 +1,16 @@ Release Notes for Symbian Build System v2 - next version Defect Fixes: +- SF Bug 2000 - [Raptor] Talon fails when installed in a path containing the string '-c' (windows only) +- SF Bug 1861 - [Raptor] More helpful console message in case of timeouts +- SF Bug 1571 - Raptor cannot report error or warning message in wrong implib project - 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 -- SF Bug 1861 - [Raptor] More helpful console message in case of Error 128 (timeout) -- SF Bug 2000 - Talon fails when installed in a path containing the string '-c' (windows only) +- Add support for PLUGIN3 TARGETTYPEs +- Fixing logfile corruption for large GCCXML builds by suppressing zip output version 2.12.2 diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/lib/config/interfaces.xml --- a/sbsv2/raptor/lib/config/interfaces.xml Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/lib/config/interfaces.xml Tue Feb 23 19:14:48 2010 +0000 @@ -5,7 +5,7 @@ - + @@ -15,6 +15,7 @@ + diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/lib/config/winscw.xml --- a/sbsv2/raptor/lib/config/winscw.xml Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/lib/config/winscw.xml Tue Feb 23 19:14:48 2010 +0000 @@ -41,6 +41,7 @@ + diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/lib/flm/e32abiv2defaults.mk --- a/sbsv2/raptor/lib/flm/e32abiv2defaults.mk Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2defaults.mk Tue Feb 23 19:14:48 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" @@ -59,7 +59,7 @@ LINKER_ENTRYPOINT_ADORNMENT:=(uc_exe_.o) endif - ifeq ($(call isoneof,$(TARGETTYPE),ani textnotifier2 stddll plugin fsy pdl dll pdll),1) + ifeq ($(call isoneof,$(TARGETTYPE),ani textnotifier2 stddll plugin plugin3 fsy pdl dll pdll),1) LINKER_ENTRYPOINT_ADORNMENT:=(uc_dll_.o) endif diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/lib/flm/e32abiv2plugin.flm --- a/sbsv2/raptor/lib/flm/e32abiv2plugin.flm Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2plugin.flm Tue Feb 23 19:14:48 2010 +0000 @@ -16,7 +16,7 @@ # # -ifeq ($(TARGETTYPE),plugin) +ifneq ($(filter plugin plugin3,$(TARGETTYPE)),) include $(FLMHOME)/e32abiv2defaults.mk # Default Linker settings for this target type @@ -50,6 +50,10 @@ # We could check the UID rather than forcing it # but there seems to be no point in that. UID2:=10009D8D +ifeq ($(TARGETTYPE),plugin3) +UID2:=10009D93 +POSTLINKTARGETTYPE:=PLUGIN3 +endif RESOURCEPATH:=Resource/Plugins @@ -64,5 +68,5 @@ $(call vrestore) else -$(error $e32abiv2plugin.flm called with wrong TARGETTYPE (should be 'plugin' but is '$(TARGETTYPE)')) +$(error $e32abiv2plugin.flm called with wrong TARGETTYPE (should be 'plugin' or 'plugin3' but is '$(TARGETTYPE)')) endif diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/lib/flm/emulator.xml --- a/sbsv2/raptor/lib/flm/emulator.xml Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/lib/flm/emulator.xml Tue Feb 23 19:14:48 2010 +0000 @@ -231,6 +231,9 @@ + + + diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/lib/flm/gccxml.flm --- a/sbsv2/raptor/lib/flm/gccxml.flm Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/lib/flm/gccxml.flm Tue Feb 23 19:14:48 2010 +0000 @@ -71,7 +71,7 @@ # $(2) list of further variable arguments to group in 150 element calls define groupcallin50 $(if $2,$1 $(foreach L,$(wordlist 1,50,$2),$(L)),) - $(if $2,$(call groupcallin50,$1,$(wordlist 51,$(words $2),$2)),true) + $(if $2,$(call groupcallin50,$1,$(wordlist 51,$(words $2),$2)),@true) endef # echos content to a file in groups performing optional search/replace based on passed args @@ -235,7 +235,7 @@ # note: the main call here needs to reside outside of start/endrule in order to avoid command line length issues. define gccxmlpackage $(TEMPGXPARCHIVE): $(MMPXMLFILE) $(SRCXMLFILES) $(DEFFILE) - $$(call groupcallin50,$(ZIP) -j $$@,$$^ $(RFIFILES)) ; + $$(call groupcallin50,@$(ZIP) -j $$@ > /dev/null 2>&1,$$^ $(RFIFILES)) ; $(call startrule,gccxmlpackage) \ $(GNURM) -f $(GXPARCHIVE) && \ $(GNUCP) $$@ $(GXPARCHIVE) \ diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/lib/flm/standard.xml --- a/sbsv2/raptor/lib/flm/standard.xml Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/lib/flm/standard.xml Tue Feb 23 19:14:48 2010 +0000 @@ -237,6 +237,8 @@ + + diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/lib/flm/win32plugin.flm --- a/sbsv2/raptor/lib/flm/win32plugin.flm Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/lib/flm/win32plugin.flm Tue Feb 23 19:14:48 2010 +0000 @@ -1,4 +1,4 @@ -# 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" @@ -16,19 +16,22 @@ # # -ifeq ($(TARGETTYPE),plugin) - +ifneq ($(filter plugin plugin3,$(TARGETTYPE)),) BASE_TYPE:=dll CW_STATIC_RUNTIME:=1 FIRST_STATLIB:= FIXED_EXPORT:=?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z SUPPORTS_IMPORT_LIBRARY:=0 SYSTEM_TARGET:=0 + UID2_DEFAULT:=10009D8D +ifeq ($(TARGETTYPE),plugin3) +UID2_DEFAULT:=10009D93 +endif # Use the general win32 FLM include $(FLMHOME)/win32.flm else -$(error $win32plugin.flm called with wrong TARGETTYPE (should be 'plugin' but is '$(TARGETTYPE)')) +$(error $win32plugin.flm called with wrong TARGETTYPE (should be 'plugin' or 'plugin3' but is '$(TARGETTYPE)')) endif diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/python/plugins/filter_terminal.py --- a/sbsv2/raptor/python/plugins/filter_terminal.py Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/python/plugins/filter_terminal.py Tue Feb 23 19:14:48 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" diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/python/raptor_meta.py --- a/sbsv2/raptor/python/raptor_meta.py Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/python/raptor_meta.py Tue Feb 23 19:14:48 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" @@ -2177,6 +2177,9 @@ self.BuildVariant.AddOperation(raptor_data.Set("DEFFILEKEYWORD", deffile_keyword)) self.__debug("Set DEFFILEKEYWORD to '%s'",deffile_keyword) + # If target type is "implib" it must have a def file + self.checkImplibDefFile(resolvedDefFile) + # if this target type has a default TARGETPATH other than "" for # resources then we need to add that default to all resources which # do not explicitly set the TARGETPATH themselves. @@ -2268,6 +2271,14 @@ """Target type in lower case - the standard format""" return self.__targettype.lower() + def checkImplibDefFile(self, defFile): + """Project with target type implib must have DEFFILE defined + explicitly or implicitly, otherwise it is an error + """ + if self.getTargetType() == 'implib' and defFile == '': + self.__Raptor.Error("No DEF File for IMPLIB target type in " + \ + self.__currentMmpFile, bldinf=self.__bldInfFilename) + def resolveDefFile(self, aTARGET, aBuildPlatform): """Returns a fully resolved DEFFILE entry depending on .mmp file location and TARGET, DEFFILE and NOSTRICTDEF entries in the .mmp file itself (where appropriate). diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/schema/build/log/1_0.xsd --- a/sbsv2/raptor/schema/build/log/1_0.xsd Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/schema/build/log/1_0.xsd Tue Feb 23 19:14:48 2010 +0000 @@ -3,7 +3,7 @@ - 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 @@ - + + diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/test/smoke_suite/implib_nodef.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/implib_nodef.py Tue Feb 23 19:14:48 2010 +0000 @@ -0,0 +1,55 @@ +# +# Copyright (c) 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". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + +from raptor_tests import SmokeTest + +def run(): + t = SmokeTest() + + t.id = "71a" + t.name = "implib_implicit_def" + t.command = "sbs -b smoke_suite/test_resources/simple_implib/nodef/group/bld.inf" \ + + " -p implib_implicit_def.mmp" + t.targets = [ + "$(EPOCROOT)/epoc32/release/armv5/lib/implib_implicit_def.dso", + "$(EPOCROOT)/epoc32/release/armv5/lib/implib_implicit_def{000a0000}.dso", + "$(EPOCROOT)/epoc32/release/winscw/udeb/implib_implicit_def.lib" + ] + t.run("linux") + if t.result == SmokeTest.SKIP: + t.targets.extend([ + "$(EPOCROOT)/epoc32/release/armv5/lib/implib_implicit_def.lib", + "$(EPOCROOT)/epoc32/release/armv5/lib/implib_implicit_def{000a0000}.lib" + ]) + t.run("windows") + + t.id = "71b" + t.name = "implib_no_def" + t.command = "sbs -b smoke_suite/test_resources/simple_implib/nodef/group/bld.inf" \ + + " -p implib_no_def.mmp" + t.targets = [] + t.mustmatch = [ + "No DEF File for IMPLIB target type in" + ] + t.errors = 2 # 1 for winscw and 1 for armv5 + t.returncode = 1 + t.run() + + t.id = "71" + t.name = "implib_nodef" + t.print_result() + + return t diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/test/smoke_suite/plugin_armv5_winscw_freeze.py --- a/sbsv2/raptor/test/smoke_suite/plugin_armv5_winscw_freeze.py Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/plugin_armv5_winscw_freeze.py Tue Feb 23 19:14:48 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" @@ -20,15 +20,16 @@ t = SmokeTest() t.id = "90" t.name = "plugin_armv5_winscw_freeze" - t.description = """Builds two PLUGIN components, one with and one without an explicit DEFFILE statement, - and confirms the correct FREEZE behaviour in each case. The correct behaviour for a PLUGIN is indicative - of all TARGETTYPEs where the build system defines known exports: FREEZE should do nothing unless an - explicit DEFFILE statement is present in the .mmp file.""" + t.description = """Builds several ECOM plugins, with and without explicit DEFFILE statements, confirming + the correct FREEZE behaviour in each case. The correct behaviour for a PLUGIN/PLUGIN3 is + indicative of all TARGETTYPEs where the build system defines known exports: FREEZE should do nothing + unless an explicit DEFFILE statement is present in the .mmp file. + Also confirms default UID2 settings for PLUGIN3 TARGETTYPEs.""" t.usebash = True t.command = """ sbs -b smoke_suite/test_resources/simple_plugin/bld.inf -c armv5_urel -c winscw_urel CLEAN > /dev/null && - sbs -b smoke_suite/test_resources/simple_plugin/bld.inf -c armv5_urel -c winscw_urel > /dev/null && + sbs -f- -b smoke_suite/test_resources/simple_plugin/bld.inf -c armv5_urel -c winscw_urel && sbs -b smoke_suite/test_resources/simple_plugin/bld.inf -c armv5_urel -c winscw_urel FREEZE -m ${SBSMAKEFILE} -f ${SBSLOGFILE}""" t.targets = [ @@ -43,7 +44,10 @@ t.mustmatch = [ ".*EFREEZE: Appending 3 New Export$s$ to .*/test/smoke_suite/test_resources/simple_plugin/eabi/plugin2u.def.*", - ".*EFREEZE: Appending 1 New Export$s$ to .*/test/smoke_suite/test_resources/simple_plugin/bwins/plugin2u.def.*" + ".*EFREEZE: Appending 1 New Export$s$ to .*/test/smoke_suite/test_resources/simple_plugin/bwins/plugin2u.def.*", + ".*__EMULATOR_IMAGE_HEADER2\(0x10000079,0x10009D93,0x00000000.*", + ".*elf2e32.*--targettype=PLUGIN3.*--output=.*plugin3.dll.*--uid2=0x10009D93.*" + ] t.mustnotmatch = [ @@ -51,6 +55,6 @@ ".*EFREEZE: .*/test/smoke_suite/test_resources/simple_plugin/bwins/pluginu.def.*" ] - t.warnings = 2 + t.warnings = 4 t.run() return t diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/test/smoke_suite/test_resources/simple_implib/nodef/bwins/implib_implicit_def.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_implib/nodef/bwins/implib_implicit_def.def Tue Feb 23 19:14:48 2010 +0000 @@ -0,0 +1,5 @@ +EXPORTS +; NEW: + ?NewLC@CMessenger@@SAPAV1@AAVCConsoleBase@@ABVTDesC16@@@Z @ 1 NONAME ; public: static class CMessenger * __cdecl CMessenger::NewLC(class CConsoleBase &,class TDesC16 const &) + ?ShowMessage@CMessenger@@QAEXXZ @ 2 NONAME ; public: void __thiscall CMessenger::ShowMessage(void) + diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/test/smoke_suite/test_resources/simple_implib/nodef/eabi/implib_implicit_def.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_implib/nodef/eabi/implib_implicit_def.def Tue Feb 23 19:14:48 2010 +0000 @@ -0,0 +1,6 @@ +EXPORTS + _ZN10CMessenger11ShowMessageEv @ 1 NONAME + _ZN10CMessenger5NewLCER12CConsoleBaseRK7TDesC16 @ 2 NONAME + _ZTI10CMessenger @ 3 NONAME ; ## + _ZTV10CMessenger @ 4 NONAME ; ## + diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/test/smoke_suite/test_resources/simple_implib/nodef/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_implib/nodef/group/bld.inf Tue Feb 23 19:14:48 2010 +0000 @@ -0,0 +1,24 @@ +/* +* Copyright (c) 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". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + +PRJ_PLATFORMS +WINSCW ARMV5 ARMV5SMP + +PRJ_MMPFILES +implib_no_def.mmp +implib_implicit_def.mmp diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/test/smoke_suite/test_resources/simple_implib/nodef/group/implib_implicit_def.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_implib/nodef/group/implib_implicit_def.mmp Tue Feb 23 19:14:48 2010 +0000 @@ -0,0 +1,23 @@ +/* +* Copyright (c) 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". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + +TARGET implib_implicit_def.lib +TARGETTYPE implib + +NOSTRICTDEF + diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/test/smoke_suite/test_resources/simple_implib/nodef/group/implib_no_def.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_implib/nodef/group/implib_no_def.mmp Tue Feb 23 19:14:48 2010 +0000 @@ -0,0 +1,23 @@ +/* +* Copyright (c) 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". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + +TARGET implib_no_def.lib +TARGETTYPE implib + +NOSTRICTDEF + diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/bld.inf --- a/sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/bld.inf Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/bld.inf Tue Feb 23 19:14:48 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" @@ -18,3 +18,4 @@ PRJ_MMPFILES plugin.mmp plugin_with_deffile.mmp +plugin3.mmp diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/plugin3.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/plugin3.mmp Tue Feb 23 19:14:48 2010 +0000 @@ -0,0 +1,29 @@ +/* +* Copyright (c) 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". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* Example ECOMP plugin3 component, with no UID listed +* +*/ + + + +TARGET plugin3.dll +TARGETTYPE plugin3 +CAPABILITY Protserv +VENDORID 0x70000001 +SOURCEPATH . +SOURCE plugin.cpp +SYSTEMINCLUDE /epoc32/include +SYSTEMINCLUDE /epoc32/include/ecom +LIBRARY euser.lib apmime.lib efsrv.lib diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/test/smoke_suite/timeout.py --- a/sbsv2/raptor/test/smoke_suite/timeout.py Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/timeout.py Tue Feb 23 19:14:48 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" diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/util/talon/process.c --- a/sbsv2/raptor/util/talon/process.c Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/util/talon/process.c Tue Feb 23 19:14:48 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" diff -r 6846d05399b6 -r c1e5ac1e307e sbsv2/raptor/util/talon/talon.c --- a/sbsv2/raptor/util/talon/talon.c Tue Feb 23 19:02:48 2010 +0000 +++ b/sbsv2/raptor/util/talon/talon.c Tue Feb 23 19:14:48 2010 +0000 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2010 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"