# HG changeset patch # User yiluzhu # Date 1264515607 0 # Node ID d23e846951c5595b944e945cf37e5d9d7d936b8e # Parent adc615fe34e8445fe6da0aace09d9ae65b099b0e# Parent e8791bf8cc82f08fff7b920cdafa92574007f185 Merge with team wip diff -r adc615fe34e8 -r d23e846951c5 sbsv2/raptor/RELEASE-NOTES.txt --- a/sbsv2/raptor/RELEASE-NOTES.txt Fri Jan 22 16:42:55 2010 +0000 +++ b/sbsv2/raptor/RELEASE-NOTES.txt Tue Jan 26 14:20:07 2010 +0000 @@ -1,14 +1,12 @@ Release Notes for Symbian Build System v2 -Next version - +version 2.12.0 New Features: - New 'Patchable Constants' target type: TARGETTYPE pdll - Combine Linking and Postlinking into a single step - performance improvement. -- Support exit codes from next version of the trace compiler which will issue - them +- Support exit codes from next version of the trace compiler which will issue them - New sbs_filter script and batchfile to ease the use of sbs_filter.py. Allows filters to be executed over a log after a build has been done. e.g. @@ -49,6 +47,8 @@ The output is in CSV format. Defect Fixes: +- fix for ARM9E + ARMV5 pre-processing confusion +- SF bug 1606: template_ext.flm wrongly creates dependencies to OTHER_CFG targets - SF bug 1570: Adding then removing a capability can produce incorrect result: e.g. ALL TCB -TCB becomes ALL -TCB but it should be just ALL @@ -57,8 +57,6 @@ older versions of Python). - - version 2.11.3 Defect Fixes: diff -r adc615fe34e8 -r d23e846951c5 sbsv2/raptor/bin/sbs.bat --- a/sbsv2/raptor/bin/sbs.bat Fri Jan 22 16:42:55 2010 +0000 +++ b/sbsv2/raptor/bin/sbs.bat Tue Jan 26 14:20:07 2010 +0000 @@ -23,9 +23,9 @@ @IF NOT "%SBS_HOME%"=="" goto foundhome @SET RAPTORBINDIR=%~dp0 @SET WD=%cd% -@cd %RAPTORBINDIR%\.. +@cd /d %RAPTORBINDIR%\.. @SET SBS_HOME=%cd% -@cd %WD% +@cd /d %WD% :foundhome @REM Use the python set by the environment if possible diff -r adc615fe34e8 -r d23e846951c5 sbsv2/raptor/lib/flm/template_ext.flm --- a/sbsv2/raptor/lib/flm/template_ext.flm Fri Jan 22 16:42:55 2010 +0000 +++ b/sbsv2/raptor/lib/flm/template_ext.flm Tue Jan 26 14:20:07 2010 +0000 @@ -85,7 +85,6 @@ UNIQ:=$(word 1,$(shell echo $(UNIQ) | $(GNUMD5SUM))) # Work out the other FINAL target if we're building both udeb and urel -ifneq ($($(UNIQ)),) ifeq ($(CFG),urel) OTHER_CFG:=udeb @@ -100,6 +99,7 @@ OTHER_CFG:=rel endif +ifneq ($($(UNIQ)_$(OTHER_CFG)),) OTHER_MAKMAKE:=$(UNIQ)_$(OTHER_CFG)_MAKMAKE OTHER_BLD:=$(UNIQ)_$(OTHER_CFG)_BLD OTHER_FREEZE:=$(UNIQ)_$(OTHER_CFG)_FREEZE @@ -111,7 +111,7 @@ endif # ifneq ($($(UNIQ)),) # Set $($(UNIQ)) so it can be detected if we're run again -$(UNIQ):=1 +$(UNIQ)_$(CFG):=1 tem_$(notdir $(TEMPLATE_EXTENSION_MAKEFILE))_$(PLATFORM)_$(CFG):=$(tem_$(notdir $(TEMPLATE_EXTENSION_MAKEFILE))_$(PLATFORM)_$(CFG)) $(UNIQ)_$(CFG) diff -r adc615fe34e8 -r d23e846951c5 sbsv2/raptor/python/raptor_meta.py diff -r adc615fe34e8 -r d23e846951c5 sbsv2/raptor/python/raptor_version.py --- a/sbsv2/raptor/python/raptor_version.py Fri Jan 22 16:42:55 2010 +0000 +++ b/sbsv2/raptor/python/raptor_version.py Tue Jan 26 14:20:07 2010 +0000 @@ -15,7 +15,7 @@ # raptor version information module # -version=(2,11,3,"2010-01-12","symbian build system") +version=(2,12,0,"2010-01-25","symbian build system") def numericversion(): """Raptor version string""" diff -r adc615fe34e8 -r d23e846951c5 sbsv2/raptor/test/smoke_suite/exe_checksource.py --- a/sbsv2/raptor/test/smoke_suite/exe_checksource.py Fri Jan 22 16:42:55 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/exe_checksource.py Tue Jan 26 14:20:07 2010 +0000 @@ -33,9 +33,8 @@ cmd3 = "grep -i '.*checksource errors found.*' ${SBSLOGFILE}" t.command = cmd1 + " && " + cmd2 + " && " + cmd3 - t.mustmatch = [ - ".* 5 checksource errors found.*" - ] + t.mustmatch_singleline = ["[1-9] checksource errors found"] + t.returncode = 1 t.run("windows") return t diff -r adc615fe34e8 -r d23e846951c5 sbsv2/raptor/test/smoke_suite/test_resources/variantplatforms/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/variantplatforms/bld.inf Tue Jan 26 14:20:07 2010 +0000 @@ -0,0 +1,43 @@ +/* +* 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 +armv5 armv6 armv7 + +PRJ_EXPORTS +variantplatforms.flm /epoc32/tools/makefile_templates/tools/variantplatforms.flm +variantplatforms.xml /epoc32/tools/makefile_templates/tools/variantplatforms.xml + +/* + set the FLM parameter based on the pre-processing macros, so that we can + test that this bld.inf is actually processed for each of the platforms + that we expect - including ones that are extensions of ARMV5 (eg. ARM9E) +*/ +#if defined(ARM9E) +#define PARAMETER arm9e +#elif defined(ARMV7) +#define PARAMETER armv7 +#elif defined(ARMV6) +#define PARAMETER armv6 +#else +#define PARAMETER armv5 +#endif + +PRJ_EXTENSIONS +start extension tools/variantplatforms +option VP PARAMETER +end diff -r adc615fe34e8 -r d23e846951c5 sbsv2/raptor/test/smoke_suite/test_resources/variantplatforms/variantplatforms.flm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/variantplatforms/variantplatforms.flm Tue Jan 26 14:20:07 2010 +0000 @@ -0,0 +1,2 @@ + +$(call raptor_phony_recipe,name,ALL,,echo "building variant platform $(VP)") diff -r adc615fe34e8 -r d23e846951c5 sbsv2/raptor/test/smoke_suite/test_resources/variantplatforms/variantplatforms.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/variantplatforms/variantplatforms.xml Tue Jan 26 14:20:07 2010 +0000 @@ -0,0 +1,8 @@ + + + + + + + + diff -r adc615fe34e8 -r d23e846951c5 sbsv2/raptor/test/smoke_suite/variantplatforms.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/variantplatforms.py Tue Jan 26 14:20:07 2010 +0000 @@ -0,0 +1,38 @@ +# +# 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 = "300" + t.name = "variantplatforms" + t.description = "Can all the variant platforms be built at the same time." + + variantplatforms = ["armv5", "armv6", "armv7", "arm9e"] + + t.usebash = True + t.command = "sbs -b smoke_suite/test_resources/variantplatforms/bld.inf -f-" + t.mustmatch_singleline = [] + + for vp in variantplatforms: + t.command += " -c " + vp + t.mustmatch_singleline.append("building variant platform " + vp) + + t.run() + + t.print_result() + return t