catchup merge - removed my foundation model changes from merge and will re-apply later (merge conflicts not worth resolving due to model order changing).

foundation config - changed to use 'sf.os.compile.iterate' to workaround problems with raptor with single model.

catchup merge

Removing GT charconv components that get overwritten in a standard S60 build. Note that this means that some tools are older.

Removed helix repository as it is not ready yet in mercurial.

Created layers for OS Tools and Tools, and added appropriate packages to these.

Added content to indicate that several of the tools components do actually contribute to the system model.

Moved conntools into its real layer - "app".

Removed top-bit-set characters from the middle of "Implementation". Moved a few of the attributes in the tags, so that they follow a consistent order.

Added helix package. Package is empty at the moment, but it is in the system model (with no units to build).

Sorted MW layer packages.

Sorted packages into order in the app layer.

Sorted packages in "os" layer into correct (alphabetical) order. (Packages in this layer in the model, but not in this layer in the repository layout, are left at the end.)

Put layers into correct (aphabetical) order.

Added a comma, so that fmpp should not barf because of an undefined value.

Removed references to package definitions for packages that do not contribute to the system definition.

Platform Build config change - updated baseline to PDK2.0d. Turned on baseline enable (to unpack tools_epoc.zip)

Removed publish.rootdir property to let the default one prevail

Added system_model_3K.xml for storage purposes. The current system_model.xml is the 1.8K version.

Cleaned-up system model where non-contributed units are removed.

Re-added "osrndtools_plat" to allow aknicon.dll to be compiled.

Updated sources_fcl.txt according to clean project. Updated models to merge API components (reduced model)

Updated SF system models to 2.0.d, containing fixes for bmconv.exe and licenseetsystub component. Updated job refs regarding single model management in FBF.

Revert internal rnd repos to use mercurial_development

Commit latest draft of Foundation model

create tag for PDK2.0.d

Use FCL of sf/mw/classicui, for changes related to BC testing

Reset after PDK 2.0.d cleanup - move all FCLs to refer to mercurial_master_prod

Use ossrv FCL containing sysutil.h collision fix

Published os/buildtools FCL to website and mercurial_master_prod - update sources_fcl.csv

Commdb build fix in 'clean' config only - removing GT version from getting generated to stop collision with exported S60 version

Renamed RND repository from updated to epoc_additional. Added a new FCL to manage conversations package.

Added two FCLs to cover fixes for 2.0.d

Add htui back into s60 model

Merge

Add correct OS model plus sysutil fix and add S60 model with corrected repo locations

Add development FCL for sf/os/buildtools, with suggested fix for Bug 151

Correct header names

Update source files to use new csv format

Repair damaged path to GDI component

Move sf/os/security package from sfl to oss

Merge commit

Update model with missing wk19 updates, add photos and contacts FCLs, remove mobiletv

Add vanilla models extracted from Week 27 code drop

Revert to using MCL version of packages that have delivered the changes we needed for platform builds.

Bug 146 - commdb export collision causes emulator instability - Model change to stop GT export.

Merged heads.

Remodeled S60sysdef to have a component-level breakdown. Updated job props to use split builds (temporary)

Tag source matching PDK_2.0.c

Use default publish location

Updated the "foundation" project to catch up with latest up-to-date "clean" project: - up-to-date sources.csv and job props. - Split system models correspond to the "contributed" versions of the "clean" project. - The combined model is the result of the merge of the split models.

Pushed more FCLs to the website, then sync'd back down to master_prod

Move more of the FCLs to mercurial_master_prod

Use the mercurial_master_prod version of the kernelhwsrv FCL

Merge heads catchup

Added the merged version of foundation OS + S60

Catch-up from production system models. Re-added non-contributed components.

Merge of config changes.

Added 'tools' type to the clean build, for doing platform builds on machines which don't have vc6 installed.

Turned "sourcesync.usecache" to Off by default. Fixed a typo in sources_fcl.csv