Reenable buildplatforms, even though it's in the wrong package. We need it for sbs_config.xml!

Add EXPORTUNFROZEN mmp rule to Orbit

Add Qt package_definition.xml with correct content

Use v3.0 package definition for stubs, as v2.0.1 is not valid for this model

remove nokia namespace from orbit package

Update root sysdef and add webruntime pkg

Fixes for missing components

Merge

Added config macros to ossrv and devciesrv. Removed some components from kernelhwsrv, cellularsrv, security, deviceplatformrelease

Add Orbit package definition to Symbian^4

Add Orbit package

Merge

No changes

Mostly cosmetic fixes to pkgdefs (introduced values, etc). Updated qmakeargs attribute in qt pkg.

Fix typo in mobcntactions, which was reusing the bldFile from cntmaptileservice

Using a dictionary no longer looks in meta sections. New argument -ignore-meta to ignore specific meta types. New xslt-param pkgAuxWidth to leave extra space on the right of packages. Fix for spanned layer height bug. Fix for namespace bug when joining. Support for drawing multiple sysdef fragments of the same rank.

Fixed namespace problem when joining non-SF namespace files. Merge can now process fragement sysdefs of the same rank.

Add missing proFile attribute to mw\qt\ package definition

Update sysdefdowngrade.xsl to preserve v3.0.0 proFile and qmakeArgs during 2.0.1 transform.

Add ROM building config components for Zoom2 and Syborg

Introduce remaining new components to match wk12 release

Add new remotemgmt_plat API components - syncml_ds_error_reporting_api & syncml_ds_customization_api

Remvoed component from mm, moved AT components here from shortlinkconn

Updated for removed components in both ^3 and ^4

Update for wk12 release

Add sources for appsupport as a temporary workaround for bug 2483

Add kernelhwsrv sources to beagleboard package

Add qt package for Symbian^3

Preview version of system model generator which supports 3.0 syntax

Added latest version of sysdeftools. See readme.txt for details on content.

First draft of Symbian^4 pkgdefs

Add root sysdef for Symbian ^4

Add missing Qt pkgdef

Remove missing api components. Revert changes not yet in SF.

Reinstate the Fax collection

Remove duplicate wsoviplugin component from mw/websrv, and correct bldFile path for omascomoadapter in app/devicecontrol

Remove bad API components, fix IDs in security pkg.

Comment out faulty <unit> elements where the bldFile is a file rather than a directory

Reinstate the cryptoservices/rootcertificates/group component needed to fix Bug 1301

Separate out all API components

Add useful comment to homescreensrv

Update CompilerCompatibility models from PDK_3.0.h

Update symbian3 models from PDK_3.0.h

Update sources.csv from PDK_3.0.h

Remove duplicated contentpublishingdebug unit - it's already present in contentpublishingdebug component with a "meta" condition

Fix typo in remotemgmt package_definition file (bldfile should be bldFile).

Catchup from default branch

Further adjustments to align package specs with the asset

Catchup from default branch

Add qt spec for CompilerCompatibility codeline

Catchup from default branch

Remove tools/homescreentools also from CompilerCompatibility codeline as not used

Remove buildplatforms dir as this package does not contain any buildable element

Remove missing component from musicplayer

Merge

catchup from default branch

Make sources point to FCL as in PDK_3.0.g. Remove tools/homescreentools as not used. Point imgeditor and videoeditor to default branch instead of RCL_3 as the latter doesn't exist/is not used

Cosmetic roto sysdef changes. Email now spans the layer and packages in app are more properly sorted by tech domain.

Use the sf/app/homescreentools, not the empty one in sf/tools/homescreentools. Add email_pub component to commonemail

catchup from default branch

symbian3 builds should take sources from MCL

catchup from default branch

symbian3 builds should take sources from RCL_3 branch

Change ossrv package_definition.xml to fix Bug 2109

Add new component "easydialing" in the phoneuis package

Minor cosmetic changes and comments

Added suplrrlpasn1 and suplrrlpprotocol components

Reinstate the bit of fontutils which build FontUtils.dll & rename the Nokia internal bit.

Fix typo in srsfenginestub bldFile

Fix typo and remove removed component in homescreentools

Fix IDs for new DRM cert components

Merge

Temporarily make referencedrmagent test to avoid build breaks.

Add new components for the fix to Bug 1993

Hack of an interim fix for LBS. Needs more work by dev team.

Add missing components to remoteconn

Recent inputmethods components added

Remove non-contributed parts of osrndtools

Fixes for missing units in app and mw layers

Remove units for removed or non-contributed bld.infs

Add some filters and missing components to mm, btservices and remotemgmt

Add API test component to camera

Fix bug 101 by marking the tzdatabase component as "test", to avoid the clash with organizer

Comment out the "fontutils" component, which exports R&D materials such as S60 fonts and the iType rasteriser. This should really be a Noka-internal component.

Fix typo in bldFile for videoplayerapp/mpxvideoplayer

Remove spurious "test" filters from camera_plat component.

Use sf_build filter for caldav components

Integration

Tidy adaptation pkgs, add caldav.

Correct path to the java_stubs general bld.inf

Reinstate the fotaapplication/fotaserver and fotaserver/fotacustcmds components

Fix paths to upnpstack components, which aren't in servicediscoveryandcontrol

Fix typo - btctrldcmoadapter component repeated the bldFile from bthid

Add nga_mdf_postprocessor, to match the content of mdfdevvideoextensions/group/bld.inf

Add caldav component, to match the sf/app/organizer/group/bld.inf file.

Catchup from default branch: remove symbian2 and update sources.csv to point to web

Removing symbian2 package specs

Take sources from the web

Put back the ipupsplugins component, which definitely exists in our source tree at PDK 3.0.g

Fix for Bug 1301 - add the cryptoservices/rootcertificates component to the copy of os/security/package_definition.xml

Add two missing components to stubs

More integration issues

Remove missing API components from graphics. Fix unconventional names and IDs

Integration

Integration

Change ID of sf_cenrep to follow file path conventions and name to follow naming conventions

Integration

Integration

Tidy up root sysdef

integration

integration

Fix integration errors. Put missing unit back in camera pkg

Merge changes

Remove more uncontributed components. Fix bad paths in files pkg

Remove non-contributed commonemail tests

Point of closest approach between joined model and PDK 3.0.g v2 single model - added adaptation layer to the root model - package_definition_3.0.xml files for qemu, beagleboard and stubs - added package_definition_3.0.xml for tools\homescreentools, and used that instead of app\homescreentools - added various extras under "sf_build", and corrected capitalisation to match single model - changed some filters from "test" to "sf_build", because we need to build those things Left out some dubious units - cross-checking shows 4 missing /sf/mw/remoteconn/connectivitytransports/plpremotelink/group /sf/mw/remoteconn/connectivitytransports/plpvariant/group /sf/os/textandloc/charconvfw/charconv/ongoing/group /sf/os/textandloc/charconvfw/charconvplugin/group

Fix wrong directory path in deviceplatformrelease

Add "test" filter to all xxx_test filters

Fix configurations in JRT pkg. Add missing stub in mmmw

More fixed conditional cases