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

SF Bug 1861 : updated talon executable

SF bug 1861 : display informative messages when timeouts occur in build tasks.

fix: Don't print what information if we have no intention of running the trace compiler.

Release note: Add support for PLUGIN3 TARGETTYPEs

fix - add support for PLUGIN3 TARGETTYPEs

Added tag stable for changeset 1e23e973ab85

catch up to default

revert SBS_PYTHON change

fix: SF Bug 1511-[Raptor] ARM LDD builds can wrongly make use of implicit .def files

DPDEF142718 Incremental rebuild fails if dependent files deleted (resurrection through merge).

Update merged tests for .DEFAULT operation.

Release note: DPDEF142718 Incremental rebuild fails if dependent files deleted

Catch-up.

Ensure that parallel parsing sbs calls pass on --no-depend-generate and --no-depend-include (as these influence makefile generation). Make .DEFAULT a double-colon target, so we don't have to worry about duplicate instances due to -include. Code review updates.

Ensure that a .DEFAULT target isn't used when --no-depend-include is in play.

Correct dependency file inclusion in GCCXML build.

Correct unit test.

Update tests to deal with tools2 Linux build differences.

Add support for NO_DEPEND_GENERATE to makefile calls and respond accordingly in FLMs. Remove remaining bits of the old (and redundant) DEPEND_SKIP variant from interfaces and FLMs. Correct CLI option storage.

Add --no-depend-generate to the front-end CLI. Create an appropriate .DEFAULT target based on --no-depend-generate *not* being used. Tweak tests.

First draft tests covering new dependency functionality.

helium_8.0-r15308

Bug 2117 - SF Raptor 2.12.1 still tries to get python from its internal distribution

merge from FCL

version 2.12.2 (candidate 2)

remove old python 2.5.2 references

escape filenames in <member> tags

version 2.12.2 (candidate 1)

Merge

test: make sure '\' characters in a string are escaped to \\ so that the regexp works

fix: use super() properly to ensure that these classes are initialised as expected.

test: test for make_engines that are aliases referring to a sequence of variants.

fix: checkcomp filter formatting updates from Samu Sillanpaa. This is a custom filter for helium scanlog's missing files-per-component reporting.

fix: filterwhatcomp and filtercheckcomp - correctly strip absolute directory and replace with EPOCROOT on windows.

fix: failure of make engine test when a make engine alias contains a modifier. There can be more than one variant per alias via "." e.g. make.extrastuff where make and extrastuff are variants.

Fix up file testing with checkwhatcomp and make epocroot driveletter stripping case insensitive.

FilterCheckComp - checking file existence by component

Merge

release: notes for sbs_filter-related changes

Tests cor check and whatTests cor check and what

fix: make filters work with new default python fix: Make Check filter actually check stuff when run from the filter

Retain MakeEngine class API. Why not?

review comments, dates, test ids

Merge

test for make engine validation

don't break sbs_init.xml files with make engine validation changes

fix: get make engine name validation working with aliases.

fix: better error messages when an incorrect make engine is specified. Requires that all make engine variants should extend "make_engine".

Oops - creating new release notes section for that new fix

Catch up

Release note: Bug 1569 - excessive recompilation in incremental tracecompiler builds

Bug 1569 - Making test case skip on Linux while TC doesn't support Linux

Bug 1569 - review improvements - making tc_incremental more robust by cleaning first and faster by building urel instead of udeb

Fixing Bug 1569 - excessive recompilation in incremental tracecompiler builds

Adding extra source file to TC winscw test code, and fixing it so it works

First drop of untested winscw TC code. Also adding missing testcase ID to tracecompiler_whatlog

Bug 1912 - Raptor should take python from the path by default

Minor update

Minor update

helium_7.0-r14027

version 2.12.1 (candidate 1)

release note: 3 fixes for 2.12.1

sf bug 1519: unescaped entities in XML logs (from make errors)

catch up

catch up to default

Merging Bug 1494 fix back in

Release note: Two trace compiler bugs fixed (SF Bug 1494 and one other)

Fixing qt_helloworld test id. Fixing copyright notices.

Renumbering commandline, pdll_arm and toolchain_macro tests to avoid duplicates. Renaming qt_helloworld, commandline and whatcomp to match the test and file names. Allocating ids to qt_helloworld and apply_usecases. Fixing typo in commandline test and enabling it so it actually runs.

Fix winscw trace compile to not use the default UID3 if unspecified

Undoing spelling 'fix'

Removing references to local file system in tc_whatlog test

Oops, typo

Fixing case non-issue just to be tidy (and to save headaches if the tracecompiler ever runs on Linux, possibly)

Fixing annoying stack traces when all you've done is kept a log file open in Vim

Fixing bug 1494 (tracecompiler whatlog) properly this time

Catch up to 2.11.3

Bug 1494 - Trace compiler files not in whatlog - FIX and TESTS though UNTESTED since only run on Linux so far

version 2.12.0 (candidate 3)

catch up to 2.12.0

version 2.12.0 (candidate 2)

merge from FCL

version 2.12.0 (candidate 1)

merge from fix

merge from wip

Merge: installer stuff

Merge

set file format of raptor_meta.py to unix when on unix

cleanups from reviews.

Default embedded Python to 2.6.4 on Windows as on Linux.

Release note: Fix SF bug 1570 - Adding then removing a capability can produce an incorrect result

fix bug 1570: actually *use* the capabilities and fix test for windows and for capability flags.

Merge test + fix for bug 1570

test: check removing then re-adding capabilities. Make sure output exe has the right caps.

fix: bug 1570 - Adding then removing a capability can fail. e.g. ALL -TCB TCB

Correct problems in raptorinstallermaker.py: ensure missing directories' names are printed rather than %s when checking Win32 support directory, and remove final reliance on SBS_HOME environment variable (use only the value passed to the -s switch).

Update Windows installation script to put Python 2.6.4 into the Windows installer.

release: fix for ARM9E + ARMV5 pre-processing confusion

variant platform test

catch up

fix for ARM9E + ARMV5 preprocessing confusion

Test fixes for whatcomp test: Deal with slashes correctly. Use Python 264.

Tab/space problem

Elimitate those testing messups that result from the case of the drive letter in SBS_HOME or EPOCROOT

Use '' to protect backslashes in arguments rather than escaping. For parallel parsing.

In epocroot handling make windows the exceptional case because it is, use os.sep.

filter and wilterwhatcomp cosmetic (style) fixes.

Merge

fix: add .stderr dumfile to log *after* make engine has exited.

Merge

Make TEM targets more unique to avoid problems building armv5 and arm9e

Merge

Merge error fixes with filterwhat stuff

remove fluff

sbs_filter: Fix so that return code is 0 on success (was always 1) filter_whatcomp: add a test for this

Merge filter_whatcomp improvements in.

Protect some parameters from bash, e.g. ";" and "\"

Stderr to a file - avoid xml problems in error messages.

Richard's fix for combined ARM9e/ARMv5 builds

Prevern Path and PATH variables from messing things up

Put stderr into separate log file

Don't mess around with EPOCROOT until actually entering raptor so we know what the original was Put the original epocroot back on the front of the whatcomp output. This allows what output to be either relative or absolute depending on what your epocroot is.

Release notes. Also remember to add FilterCheck

Cause whatcomp output to use the incoming epocroot value. i.e. if epocroot is relative then so is the what output. e.g. if EPOCROOT=\ then the output will be of the form "\epoc32\release\armv5\...." If it's "..\myepocroot" then the output will be "..\myepocroot\epoc32\release\armv5". If it's absolute then the what output will also be absolute.

Strip epocroot off whatcomp filter output.

Release note: sf bug 1558: [Raptor] auto-setting of SBS_HOME by sbs.bat fails when drives differ

Release: DPDEF143051 Raptor doesn't process the LINKEROPTION keyword as Abld

Merge

Test case for Apply linker options

DPDEF143051 Raptor doesn't process the LINKEROPTION keyword as Abld does

catch up

catch up to 2.11.3 from default

update Qt test

Release: move Qt test to smoke suite.

Move Qt test to manual suite

Add Qt test helloworld for Windows

single character fix for --unpaged

release notes for whatcomp filter, recipestats.py, tracecompiler exit code, timelines.py

apply review comments: whatcomp filter recipestats.py and timelines.py

catchup

merge into the wip

catchup merge

catchup

catchup

Catchup merge

RELEASE NOTE: Added new launchers for the sbs_filter program so that there is no longer a need to manually set the HOSTPLATFORM variable RELEASE NOTE: Added a new "FilterWhatComp" filter that mimics an ABLD log with information about the component from which particular releasables came from. This is a derivative of "FilterWhat."

Merge : status code fix for recipetimings

Merge

Recipestats summarises recipe times by type from a log. Timelines illustrates build progress in a graph as it happens by reading the log output.

Make TC fail when there is an error. This is hypothetical in this version but the next version of the TC is in testing.

Fix errors with parsing exit codes in status tags

Added a script for finding out how time each class of recipes took in the build

catchup to wip

A build log visualisation tool

Release: Patchable Constants TARGETTYPE

Adding test ids. Fixing pdll test code to use its own def files.

Review rework: Removing result trackers

Review rework 1: Enabling winscw builds of PDLLs

Adding a patchable constants dll (PDLL) targettype + tests

Updates to Raptor Installer Maker tool to take into account win32-support repository location.

catch up to 2.11.2 from fix

Release: Combine Linking and Postlinking into a single step.

Merging changes from pull.

Application of review comments.

Add dependency for .sym files.

Remove e32postlink.mk

Tidy up e32abiv2.flm for submission to team branch and emove unneccesary e32postlink.mk file.

Experimental combined linknpostlink.

Catch up

Removed headers that are not needed

Minor fix

Minor fix

Minor change

Minor fix

Fixed

Catch up

Added performance test for comparing how long different versions of python take to parse mmps and perform exports

Correct backslash escaping to only operate on non-'path' and 'tool' types.

Deal with backslashes at the end of <env/> values

Environment variables in the log are sorted alphabetically.

Disable scanning ARM's own libraries for RVCT4.0 objects

Bug 1606 - template_ext.flm wrongly creates dependencies to OTHER_CFG targets

catch up to 2.11.3 from fix

release: version 2.11.3 (candidate 2)

DPDEF142616 Raptor: Variables can be set unnecessarily prior to TEM execution

release: version 2.11.3

typo: bug 170 was fixed, not 107

Release note: sf bug 518: unpaged keyword in mmp files is not parsed properly

single character fix for --unpaged

Release note: sf bug 107: invalid XML output when a zip file is missing

sf bug 170: invalid XML output when zip file is missing

resubmit fix for DPDEF141787 which was dropped off during merging

Release: filter terminal flags up when recipe truncated

filter terminal flags up if recipe exceeds line limit

Raptor 2.11.2 Plus a little bit.

version 2.11.2 to default from fix

version 2.11.2 (candidate 1)

Corrected test script.

DPDEF143176 raptor does not respect STDCPP mmp file keyword

catch up to 2.11.1 from default

version 2.11.1 to default from wip

added scipt for checking exports across multiple logs

version 2.11.1 (candidate 1)

Remove spurious bracket from ARM link of TEXTNOTIFIER2 builds.