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