Update release information and product version.

pull from trunk

elf2e32 treatment of ARM$$INIT_ARRAY$$Base can break GCCE builds

Solve incorrect handling of ExportName=SymbolName@Ordinal syntax

Solving incorrect handling when processing ExportName=SymbolName@Ordinal syntax.

change featuredatabase.xml back

update feature database

merge after pull

update version info

update release info

add rofs image compare

Fix the illegal word scanned by sfchecksource tools

sbs version 2.15.3

update release info

revert the change to rofsbuild image format, but add checking codes to prevent address overflow

fix the Serious problem with ROFS on-disk format

remove migrated template meta data files (in DFS_MCL wk42)

merge with team repo

remove the emulatorlauncher

Remove the PrintingServices component from TB10.1 on wards(on behalf of dane.waby@nokia.com)

sync from svn

Merge: remove incorrect heard

Merge again

revert to 7c11c3d8d025

Merge

Bugfixes and additional validation for sysdeftools

Sysdeftools additional support for merging misordered system definitions. More extensive validation. Minor bug fixes. Bash wrappers for perl scripts for unix installs.

Merge

Test and fail for badly invalid unit elements when joining

joinsysdef wasn't properly translating the namespace prefix for "replace".

Fix merging bug where downstream items somtimes got ignored if they appear after an upstream-only item. Also, reduce the severity of the validation error if a tech-domain is not recognised on a non-Foundation package.

sync up SVN codes

romtools 13.2.0.1

fix bug #3691: Fix for Bug 2413 create regression for ARM lib files.

Add export for s60ibymacros.pm (re-applies missing part of fix for Bug 2901

Enhance buildrom.pm to enable final OBY file to be converted into acceptable input for buildrom (Bug 3862)

Added in fix to Bug 2149

Remove distribution.policy file

Merge

ROM Tools 13.1.0.4

merge

helium_12.0.0-63b64366f9cf

Added in fix to Bug 2149

remove defunct tool from utilities build

Fix No rule to make SC issue

sbs version 2.15.2

Merge sysdeftools's addtion

Joinsysdef schema calculation handles missing files. rootsystef generation does not modify embedded metatdata.

Change bld.inf install location to epoc32\tools\sysdeftools

Change bld.inf install location to /epoc32/tools/metatools. Fix format of component version number.

More extensive error reporting in sysdef perl tools. Allow sysdef merging with an empty upstream model.

Update .bat files so they work on directories with spaces in the names. Update the contents.xml manifest

Add verbatim functionality to filtering so it can perform chassis builds. Add ProductsDefinition file for defining exports.

ROMTools-13.1.0.2 Bug 3415 - SBS failing to build open C libraries

Delivery Blocks to SF

ROM Tools 13.1.0.1 Bug468 initialized static data built into a static library does not get initialized correctly

sbs version 2.15.1

Merge with changes from SF.

helium_11.0.0-e00f171ca185

Merge : re-applies missing part of fix for Bug 2901,Add export for s60ibymacros.pm

ROM Tools 12.3.4 + RCOMP 8.4.2

sbs version 2.15.0

Move sysdeftools from buildtools package into build package

DEADHEAD Branch no longer active as changes incorporated in revision c26070468a42

Add export for s60ibymacros.pm (re-applies missing part of fix for Bug 2901

Fixed Bug 2413 for evalid

Merge

Added tag helium-9.0.5 for changeset df88fead2976

helium_9.0.5-4399343f4f50

ROM Tools 12.2.0.4 Postlinker 2.2.5 Revert package_definition.xml to changeset 360bd6b35136

sbs version 2.14.2

Add prebuilt jar for changes in Bug 3222

Implement enhancement Bug 3222 - Enable Helium to set diamonds status other than "succeeded" or "failed"

fixed defect 1412

Add support for --asm option when using elf2e32 in the "expgen" recipe - see bug 2979 and bug 1405

Release-Update

Add support for --asm option when using elf2e32 in the "expgen" recipe - see bug 2979 and bug 1405

Minor change: update package_definition.xml

Minor change: remove old release-notes.txt from raptor

Merge missed changeset 11 (raptor v2.14 and helium 10.0)

Add ..\dev\.. to path

Minor changes: rofsbuild

add cpptoolsplat

add javatoolsplat and perltoolsplat

add releasing to new structure

Bug 2176 - Helium 7.0 needs patching to work with FBF

add deprecated files

Add sbsv1 to new structure

Clean up licenses and remove .bak files (cf changes 56dd7656a965 and 238f4cb8391f)

Move s60ibymacros.pm into buildrom_plugins, and export it to epoc32\tools - bug 2901

Updated to iMaker version 10.24.01, 14-Jun-2010.

-Added s60ibymacros.pm as buildrom plugin.

helium_7.0.x-r16015 missed some files...

helium_7.0.x-r16015

Creating helium-7.0.x branch

raptor v2.14.0

buildrom v3.24.0, rombuild v2.17.3, rofsbuild v2.10.4, resource compiler v8.4.001, image check v1.4.0, elftools v2.3, elf2e32 v2.3

Add --asm option to elf2e32, so that GCCE builds can use --asm=gas with --dump=a and get a usable .s file (Bug 1405)

helium-10.0.0-bc45d50958fe

helium_9.0-a7879c935424

Supply a version of s60ibymacros.pm, to fix Bug 2901

Minor: remove backup file with incorrect license info

-Changed SF licence to EPL licence.

Added tag stable for changeset dbec85ee2eeb

Added tag 2.14.1 for changeset 001207698765

Added tag stable for changeset 6209aeff0f73

Fixing sbs_filter issue.

Version 2.14.1 [Candidate 1]

Merge from fix

fix comment

Merge resource uniqueness fix

remove unused INTERBASE variable. Use TARGET_lower where it's clearer.

Release note: Bug 2809 - [Raptor] Intermediate Resource Filenames not unique, rom fails to boot

fix: ensure that intermediate resource filenames are unique in some uncommon situations

Release note: Bug 2203 - [Raptor] Building extension makefile with SBS_BUILD_DIR set to another drive

edit comment

SF bug 2203 [Raptor] Building extension makefile with SBS_BUILD_DIR set to another drive

Merge

fix: bug was preventing tcom speedup from accumulating source files with successive builds.

release note and review comment tidyup for tcom speedup

fix: enable large sourcefile lists with TCom

Merge tcom speedup

fix: tracecompiler speedup. Don't trigger scanlog with md5sum errors since they are expected. Use a grouping macro to avoid commandline length limits.

fix: trace compiler speedup

Added empty default value for TARGETPATH MMP keyword.

Fix for SF Bug 2562[Raptor]adds incorrect entries into .iby files w.r.t file paths

Merge

RELEASE: Bug 2651 - [Raptor] creates incorrect .iby files w.r.t target file versions & ramtargets Note: I've added a new 'next version' to the release notes since I've not merged in 2.14.0 yet.

Fix for Bug 2561 - Explicitly versioned MMPs produce invalid IBYs

Merge from default version 2.14.0.

Added tag 2.14.0 for changeset e7dd8533063f

Added tag stable for changeset e7dd8533063f

Version 2.14.0 (candidate one).

Merge from wip.

Merge from fix.

fix: pull less modules into depcrunch. fix timing test. Don't report RPP unnecessarily in resource FLM.

fix: make sure depcrunch test can fail

fix: depcrunch was using re.match where re.findall was what was wanted. Add a test.

Put DEPCRUNCH with resource.flm, but keep python as a globally available variable.

fixes for review comments. better docs. copyrights. make copy filter more modular, change <copy> tag to <filtercopy>

fix tests for resources. Add python dependency manipulation because it's understandable to humans.

fix: resource deps fixups on windows. ugh

fix: resource names

fix: rfi files now only consist of one dependency file for all resources

fix: switch rfi file creation back on

Merge in resource performance improvements #2

Release Notes: resource performance improvements

fix a resource copy problem (not copying when multiple copies required) that showed up in the tests.

fixups: tests for resource improvements

fix: take action on copy tags at the end of build phases.

small resource fixes

fix: resource problem - horrible code that tries to produce different versions of the same resource - preevent file mixup in this case.

fix resource deps: generate more cleanly - no targets if there are no prereqs. no empty lines. fix resource copy performance: remove debug fix filters: behave if someone puts 2 identically named filters into the plugin dir by mistake.

fix performance: copy resources in the frontend. Helps cluster builds since remote copying is inefficient.

minimising dependencies might have helped after all by ecluding something that's getting updated that maybe shouldn't. Try it out again.

Merge

fix: use only one dependency file per resource - not one per language per resource. Speed improvement. fix: revert dependency minimisation (doesn't help, causes problems)

improve resource copying speed on certain clustered build systems by forcing them to happen locally.

allow recipestats to print hosts used in the build.

Merge.

Application of review comments for fix to SF Bug 2605 - [Raptor] ROMFILE creation using Raptor is not clean.

Release Note: SF Bug 2605 - [Raptor] ROMFILE creation using Raptor is not clean

Fix for SF Bug 2605 - [Raptor] ROMFILE creation using Raptor is not clean.

Merge New TCom support and fix release notes

fix: dont' automatically set OST_TRACE_IN_USE after all as some components have odd build errors with it. We must get them fixed first then redo it.

fix: tracecompiler - recognise old versions which do have a Main class but don't have a CLI.

Merge in New tracecompiler support

Use TRACE_RELEASABLE_ID more consistently. Fix comment spelling.

Make tests cope with the renamed trace marker files.

fix: calculate autogen header locations every time.

Somewhat more sane choice of directory. Fix problem where winscw migh have had wrong TARGETEXT var.

correct comments.

Better release notes.

fix releasenotes

notes about tcomsupport update

fix: support new trace compiler features for preventing clashes. Automatically turn on OST_TRACE_COMPILER_IN_USE macro. Look for trace header in systemincludes. Make directories in makefile parse to prevent clashes during build. Correct path for autogen headers. Correct case issue with autogen headers on Linux.

Release note: sf bug 2495: KDLL TARGETTYPEs do not support .def file freezing

release note: do not generate abiv1 import libs by default

merge from team wip

apply review comments

test changes for abiv1 kit property

make ABIv1 implib support a kit property

change to lowercase method names

missed a file

refactor tools2 for --query

release note: add --query option

forgot windows drive letter in test

refactoring for --query

add --query option

Carbide.xml now contains *_gcce aliases so that Carbide can pick up these things the upcoming SDK

Merge

Release note: SF Bug 2420 - [Raptor] Output from recipes is mis-recognised as "what" output

fix test cases

change copyright

Bug 2420 - [Raptor] Output from recipes is mis-recognised as "what" output

Release note: sf bug 2174: --layer option shows errors when bld.inf missing in another layer

Make copyfromannofile test work on windows.

Merge resource performance imps.

Merge

fix: stop including dep files in the depfile generation stage. Remove other unnecessary stuff from RESOURCE_DEPS

fix: even more minimal resource dependendcies.

fix: recipestats.py produces "correct" header line, also sorts by time to show recipe using the largest time first.

doc: slight more commenting for resource dpe minimisation

Fix a copyright date. Make sure all FLMBDEBUG usage is wrapped in <debug> tags.

Merge windows tests fix for rpp dep files.

fix: fix tests for .rpp and .rpp.d files new location

Merge fix to RC4 default

fix: Make resource dep minimisation work when output file starts with a line containing "\"

Merge default into my fix

Merge

Merge

fix: resource cleaning fix fix: make copies immediately after generating the resource if possible since it will keep file caches hot.

fix: resource dependencies sometimes not generated because of too-early expansion of variable.

resource test - small review comment fixes

fix: resource speedup's whatlog handling. update other tests to cope with alternate rpp.d files.

fix: revert -iquote since older cpps don't understand it fix: remove stupid repetition of for loop. tt: Enter commit message. Lines beginning with 'HG:' are removed.

comments: better commenting in resource.flm

copyright fixes

Merge in resource speedups

fix: don't generate multiple copies of the same resource just because there are several target paths. Generate it once and copy that to the different target paths.

fix: don't regenrate resources for WINSCW

merge

fix: prevent regeneration of resources for winscw after an armv5 build

test: resource dependencies - to be used when ensuring that depcrunching works

Fix: Resource stage parse performance affected by huge size of included dependency files

merge 2.13.0 from default

merge 2.13.0 from default

release note: bug 2297 - Python exception in raptor_meta.py when processing bld.inf file

fix for bug 2297 : traceback on unmatched END in a bld.inf

merge 2.13.0 (candidate 2) from default

merge 2.13.0 (candidate 2) from default

release note: pass parameters to log filters from the command line

catch up

apply review comments

new FilterComp log filter

pass optional parameters to log filters from the command line

Fix mismatches in test names vs. file names.

Release note: add delete on failed compile work-around for RVCT 2.2.

Merge.

Apply missed review comment change.

Application of review comments.

Ensure that delete on failed compile is used only with RVCT 2.2.

Changes to delete on failed compile test.

Changes for delete on failed compile.

Remove redundant head.

Added tag 2.12.2 for changeset 1e23e973ab85

Added tag 2.12.3 for changeset 007900c31eef

Added tag 2.12.0 for changeset 2bc875af3200

Added tag 2.12.1 for changeset 4e477ddf2eed

Added tag 2.12.4 for changeset 976aca38ffe5

Added tag 2.12.5 for changeset 7006bcce5299

Added tag 2.13.0 for changeset 679d97112f98

Merge default with raptor 2.13.0 stable

Added tag stable for changeset 679d97112f98

version 2.13.0 (candidate 4)

Fix : ensure that FLMDEBUG is empty by default

version 2.13.0 (candidate 3)

Fix : sort build configurations by name for metadata preprocessing

Update linux installer maker for new license.txt and HTML release notes.

version 2.13.0 (candidate 2)

Update Windows installer script for release notes changes

version 2.13.0 (candidate 1)

merge from fix

Mods to cli_makevar_override.py test (removal makefile grep and change to pass on correct expected raptor warning)

merge from fix

fixed permissions check for executable files exported on systems where 'ls' reports alternative access characters

Another small tweek to fix case issue for cli_makevar_override test

Small tweek to let the test framework know about an expected raptor warning.

Addition of test for SF Bug 2134 fix: Raptor does not pass overridden make variables into its makefiles

release note: do not allow data to be paged implicitly

catch up

fixed stdout+stderr mixing in tests

PAGED means PAGEDCODE

Release note: SF bug 2134 Raptor does not pass overridden make variables into its makefiles

merge from fix

review comment: remove unused variable.

Merge annofile and talon tidyup with fix

Merge

fix: stop using "magic" numbers in string operations for the copyannofile2log feature fix: When using the copylogfromannofile workaround, extract the build ID and build duration and add to the log as these are useful for analysis. The log should now be identical to the stdout file. fix: Remove extra blank lines from output in copylogfromannofile mode.

refactor: make talon's choice of result message easier to read in the code as per Richard's suggestion.

merge from wip

merge correction

release note: DPDEF143101 - GCC-E isn't tested as part of the tool checking mechanism

release note: SF Bug 385 - Raptor doesn't handle spaces in tool directory, DPDEF143018 - Raptor doesn't handle spaces in GCCE installation directory correctly, DPDEF141195 - Raptor doesn't handle spaces in tool paths

Merge.

Code review updates.

Support for resolving, on Windows only, <env/> 'tool' and 'toolchain' type paths with spaces.

merge 2.13.0 from wip

flesh out expanded release notes

replace RELEASE-NOTES.txt with an HTML file

release note: SF Bug 2172 - [Raptor] Resource builds warn on encountering trigraph-like strings

Merge

Code review update.

Suppress trigraph warnings in resource file preprocessing.

release note: SF Bug 2308 - [Raptor]: PLUGIN3 TARGETTYPEs don't set resource output offsets correctly

merge 2.12.5 from default

Release note: SF Bug 1939 - [Raptor] PAGED keyword in MMP files should imply byte pair compressed

Merge

SF Bug 1939 - PAGED keyword in MMP files should imply byte pair compressed

release note: DPDEF144648 - Raptor failed to build tools_deb objects under Windows XP

Merge

Code review updates.

Code review update.

Remove .pdb generation from tools deb builds (enabling full parallel builds).

Added tag stable for changeset 7006bcce5299

use sort from the PATH by default

merge 2.12.5 from default

catch up

extend terminal filter tests

print list of built configs in terminal filter summary

release note: Fix: improve robustness to bad -c options

catch up

fault tolerant XML groups

catch up

merge

test data for bad groups

a bad config is not a FatalError

Updated copright year on modified files.

Added test case for EPOCNESTEDEXCEPTIONS.

Add support for MMP keyword EPOCNESTEDEXCEPTIONS

version 2.12.5 (candidate 1)

merge from fix

release note: for annofile2log

annofile2log: make sure that we get no more than the output we want in the test

add a test for annofile2log workaround for log corruption

add the bzip2 log from the wip branch.

fix: emake log output corruption fix by using output from the annotation file. Updates.

Merge

SF Bug 2191 - [Raptor] - Update binary version of talon for windows with the fix for this bug.

fix: emake log output corruption fix by using output from the annotation file.

Merge

test stdout to a file (debug XML problem)

Merge

SF Bug 2191 - [Raptor] - When forcesuccess is enabled, exit status for a failed recipe is "retry" but should be "failed"

Release note: Amendment to SF Bug 1511 fix - removal of blanked DEFFILE keyword from e32abiv2ani.flm

Release note: extend tracecompiler tests to Linux

Apply trace compiler tests on to Linux

release note: Add support for FEATUREVARIANTSAFE in BV builds.

Merge.

Support for FEATUREVARIANTSAFE.

Add Bzip2 log filter/compressor to Raptor.

Apply review comments to tidy up sbs_env.bat.

Update Cygwin 1.7 support for certain situations.

remove unhide_ci_refs workaround (compiler fixed)

catch up to 2.12.4

Merge.

Further review comments: update run.bat to run the test suite relative to its directory.

Review comments for Cygwin 1.7 changes.

Updates to Raptor Windows installer maker tool.

Remove unneccesary file.

Changes for Cygwin 1.7 support.

Add sbs_env.bat for Cygwin 1.7 support.

Release note: Add support for Cygwin 1.7.

release note: prototype System Definition v3 support

prototype of sysdef v3.0 parser

remove redundant group directory

catch up to default

Release note: fix platform macros issue when cross compile

Fix platform macros issue when cross compile

fix for missing UNHIDE_CI_REFS

Release note: Add a workaround to enable the Qt team to link their code against Symbian DLL's

Add a workaround to enable the Qt team to link their code against Symbian DLL's

catch up

catch up to 2.12.1 from default

Merge

Minor change: update test ID

catch up to default

Release Note: build win32 tools on Linux

Merge with team wip

Build win32 tools on Linux

catch up to 2.12.0

Rework troublesome $SIG{__DIE__} construct, to fix Bug 2345

another systeminclude fix. (elftran)

Fixes to mmps for header relocation.

workarround for Bug 2413 - evalid not so happy identifying libs created by new mwldsym2.exe

Evalidcompare.pm - Added search for tools in Raptor location.

Merged in 'Bug 2176 - Helium 7.0 needs patching to work with FBF'. Fix provided in Helium 8 drop - no files changed.

Bug 2176 - Helium 7.0 needs patching to work with FBF

merge

catch up to FCL

Added tag stable for changeset 976aca38ffe5

marked that 2081 is a dup of 1971 in release.txt

add bzip2 filter into 2.12.4-rc2

version 2.12.4 (candidate 2)

Merge

SF Bug 2125 - remove some comments that are no longer true. Update copyright.

SF Bug 2125 - [Raptor] - tracecompiler what output incorrect if mmp basename contains '.' e.g. fred.prd.mmp

SF Bug 1912 - Raptor should take python from the path [if not set with SBS_PYTHON or bundled with Raptor] - revised.

Merge default back into fix.

SF Bug 2113 - make test actually test so that it would actually fail if the output was wrong.

SF Bug 2113 - make test work on windows as well as linux.

SF Bug 2113 - add test file

SF Bug 2113 - [Raptor] what/check filters can assign files to the wrong components

fix: remove OSTv2 dependency so we will still work with the old one

version 2.12.4 (candidate 1)

merge from fix

fix: add talon binary with HOSTNAME fixes.

Don't run executable file mode preservation test on windows since it doesn't have the concept.

Merge

spelling mistake. Remove unused variable

release note: fix blank recipe host attribites on windows

copyright dates, remove spaces

Remove stupid whitespace changes

fix: remove unnecessary changes. Reorganise gethostname stuff so it can be debugged.

fix: use gethostname() to set host attribute as this works on a cluster whereas reading the COMPUTERNAME env var doesn't.

fix: use proper hostplatform variable, now host attributes really aren't empty on windows recipes.

Merge

fix: make sure host attribute is set rather than blank in logs on windows by using the env var 'COMPUTERNAME' instead of 'HOSTNAME'. Thus make it less difficult to order recipes in the log by time.

SF Bug 2081 - [Raptor] - Exported file executable permissions not maintained (linux)

SF Bug 1562 - [Raptor] Tracecompiler SYSTEMINCLUDE should be based on TARGETEXT not TARGETTYPE

release note: SF Bug 1912 - Raptor should take python from the path [if not set with SBS_PYTHON or bundled with Raptor]

Remerge - OSTv2 in test code

Merge - OST v2 in test code

Updating copyright notices

Updating tests to run with OSTv2

Correct sysdef test in light of merged localisation changes.

release note: SF Bug 2042 - [Raptor] component field empty in recipe

Catch-up.

Resurrect COMPONENT_NAME and LAYER_NAME output in logs when bld.inf files are gathered from system definition files. Update tests.

release note: SF Bug 2007 - [Raptor] GCCE 4.4.1 builds require 4.3.1 and 4.3.2 SBS_GCCE???BIN env vars etc.

Catch-up.

Apply some (slightly arbitrary) ordering to file content.

Catch-up.

Move all common parts of the gcce variants into gcce_base.

release note: fix reporting of .bmp files copied to epoc32/localisation

catch up

apply review #3865 comments

catch up

update tests

remove redundant bmp file copying

SF Bug 2000 - tidy up copyright dates

SF Bug 2000 - make sure we still work with batch files

SF Bug 2000 - new binaries for talon with this fix

Merge TimM's bugfixes

SF Bug 2000 - test code for commandline parsing. Also some better comments on other test files

SF Bug 2000 - Talon fails when installed in a path containing the string '-c' (windows only)

Merge - GCCXML logfile fix

Release note: Fixing GCCXML logfile corruption by hiding zip output

Hiding gccxml zip output to stop logfile corruption

Merge

Release note: Raptor cannot report error or warning message in wrong implib project

Bug 1571: Raptor cannot report error or warning message in wrong implib project

Added tag stable for changeset 007900c31eef

version 2.12.3 (candidate 1)

Merge

Merge

SF Bug 1861 - update log schema, fix some copyright notices

release note: SB Bug 1861