# HG changeset patch
# User Tyson Key <tyson.key@symbiandevco.org>
# Date 1282659584 -3600
# Node ID 176abb8bf3a602206b895dbf428c603d13b13428
# Parent  de72397f4a227dec3a13cde0afe28275162faa82
Replace "/adaptation" references with "/adapt"

diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adapt/beagleboard/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/beagleboard/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) 'N'
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose (optional|mandatory|development) 'optional'>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED>
+ <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
+ <!ATTLIST SystemBuild schema CDATA #REQUIRED>
+ <!ELEMENT list (ref+)>
+ <!ATTLIST list
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT ref EMPTY>
+ <!ATTLIST ref item CDATA #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y|N) #REQUIRED>
+ <!ELEMENT configuration (listRef+|ref+|task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
+ <!ELEMENT listRef EMPTY>
+ <!ATTLIST listRef list CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y|N) #REQUIRED
+  targetParallel (Y|N) 'N'>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  root CDATA #IMPLIED
+  command CDATA #REQUIRED>
+]>
+<SystemDefinition schema="2.0.1" name="Symbian^3">
+<systemModel>
+<layer name="adaptation" long-name="Adaptation" levels="hw-if">
+<block name="beagleboard" long-name="Beagle Board" levels="hw-if">
+<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
+<component name="omap3530" long-name="Beagle Board common" introduced="symbian^3" purpose="optional">
+<unit bldFile="/sf/adapt/beagleboard/omap3530" mrp="/sf/adapt/beagleboard/omap3530/base_beagle.mrp"/>
+</component>
+<component name="kernel" long-name="Beagle Board kernel" introduced="symbian^3" purpose="optional">
+<unit bldFile="/sf/adapt/beagleboard/omap3530/kernel"/>
+</component>
+<component name="beagleboard" long-name="Beagle Board baseport" introduced="symbian^3" purpose="optional">
+<unit bldFile="/sf/adapt/beagleboard/omap3530/beagleboard"/>
+</component>
+</collection>
+</block>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adapt/beagleboard/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/beagleboard/sources.csv	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,CompilerCompatibility,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adapt/qemu/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/qemu/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) 'N'
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose (optional|mandatory|development) 'optional'>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED>
+ <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
+ <!ATTLIST SystemBuild schema CDATA #REQUIRED>
+ <!ELEMENT list (ref+)>
+ <!ATTLIST list
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT ref EMPTY>
+ <!ATTLIST ref item CDATA #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y|N) #REQUIRED>
+ <!ELEMENT configuration (listRef+|ref+|task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
+ <!ELEMENT listRef EMPTY>
+ <!ATTLIST listRef list CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y|N) #REQUIRED
+  targetParallel (Y|N) 'N'>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  root CDATA #IMPLIED
+  command CDATA #REQUIRED>
+]>
+<SystemDefinition schema="2.0.1" name="Symbian^3">
+<systemModel>
+<layer name="adaptation" long-name="Adaptation" levels="hw-if">
+<block name="qemu" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
+<collection id="baseport" name="Baseport" level="hw-if"> 
+<component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
+<unit bldFile="/sf/adapt/qemu/baseport/syborg" mrp="/sf/adapt/qemu/baseport/syborg/syborg.mrp"/>
+</component>
+</collection>
+</block>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adapt/qemu/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/qemu/sources.csv	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,3 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,CompilerCompatibility,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,CompilerCompatibility,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adapt/stubs/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/stubs/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) 'N'
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose (optional|mandatory|development) 'optional'>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED>
+ <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
+ <!ATTLIST SystemBuild schema CDATA #REQUIRED>
+ <!ELEMENT list (ref+)>
+ <!ATTLIST list
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT ref EMPTY>
+ <!ATTLIST ref item CDATA #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y|N) #REQUIRED>
+ <!ELEMENT configuration (listRef+|ref+|task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
+ <!ELEMENT listRef EMPTY>
+ <!ATTLIST listRef list CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y|N) #REQUIRED
+  targetParallel (Y|N) 'N'>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  root CDATA #IMPLIED
+  command CDATA #REQUIRED>
+]>
+<SystemDefinition schema="2.0.1" name="Symbian^3">
+<systemModel>
+<layer name="adaptation">
+<block name="stubs">
+<collection name="s60">
+<component name="audiostubs">
+<unit bldFile="/sf/adapt/stubs/audiostubs/group" mrp=""/>
+</component>
+<component name="drm_stubs">
+<unit bldFile="/sf/adapt/stubs/drm_stubs/group" mrp=""/>
+</component>
+<component name="ocrsrv_stub">
+<unit bldFile="/sf/adapt/stubs/ocrsrv_stub/group" mrp=""/>
+</component>
+<component name="omasuplasnconverterstubimpl">
+<unit bldFile="/sf/adapt/stubs/omasuplasnconverterstubimpl/group" mrp=""/>
+</component>
+<component name="posmsgpluginreferenceimpl">
+<unit bldFile="/sf/adapt/stubs/posmsgpluginreferenceimpl/group" mrp=""/>
+</component>
+<component name="power_save_display_mode_stub">
+<unit bldFile="/sf/adapt/stubs/power_save_display_mode_stub/group" mrp=""/>
+</component>
+<component name="systemswstubs">
+<unit bldFile="/sf/adapt/stubs/systemswstubs/group" mrp=""/>
+</component>
+<component name="tactileclickplugin_stub">
+<unit bldFile="/sf/adapt/stubs/tactileclickplugin_stub/group" mrp=""/>
+</component>
+<component name="wlanhwinit_stub">
+<unit bldFile="/sf/adapt/stubs/wlanhwinit_stub/group" mrp=""/>
+</component>
+</collection>
+</block>
+</layer>
+</systemModel>
+</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adapt/stubs/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/stubs/sources.csv	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,CompilerCompatibility,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adaptation/beagleboard/package_definition.xml
--- a/CompilerCompatibility/adaptation/beagleboard/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="hw-if">
-<block name="beagleboard" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530" long-name="Beagle Board common" introduced="symbian^3" purpose="optional">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="kernel" long-name="Beagle Board kernel" introduced="symbian^3" purpose="optional">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard" long-name="Beagle Board baseport" introduced="symbian^3" purpose="optional">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adaptation/beagleboard/sources.csv
--- a/CompilerCompatibility/adaptation/beagleboard/sources.csv	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,CompilerCompatibility,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adaptation/qemu/package_definition.xml
--- a/CompilerCompatibility/adaptation/qemu/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="hw-if">
-<block name="qemu" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
-<collection id="baseport" name="Baseport" level="hw-if"> 
-<component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
-<unit bldFile="/sf/adaptation/qemu/baseport/syborg" mrp="/sf/adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adaptation/qemu/sources.csv
--- a/CompilerCompatibility/adaptation/qemu/sources.csv	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,CompilerCompatibility,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,CompilerCompatibility,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adaptation/stubs/package_definition.xml
--- a/CompilerCompatibility/adaptation/stubs/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="adaptation">
-<block name="stubs">
-<collection name="s60">
-<component name="audiostubs">
-<unit bldFile="/sf/adaptation/stubs/audiostubs/group" mrp=""/>
-</component>
-<component name="drm_stubs">
-<unit bldFile="/sf/adaptation/stubs/drm_stubs/group" mrp=""/>
-</component>
-<component name="ocrsrv_stub">
-<unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group" mrp=""/>
-</component>
-<component name="omasuplasnconverterstubimpl">
-<unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group" mrp=""/>
-</component>
-<component name="posmsgpluginreferenceimpl">
-<unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group" mrp=""/>
-</component>
-<component name="power_save_display_mode_stub">
-<unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group" mrp=""/>
-</component>
-<component name="systemswstubs">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/group" mrp=""/>
-</component>
-<component name="tactileclickplugin_stub">
-<unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group" mrp=""/>
-</component>
-<component name="wlanhwinit_stub">
-<unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 CompilerCompatibility/adaptation/stubs/sources.csv
--- a/CompilerCompatibility/adaptation/stubs/sources.csv	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,CompilerCompatibility,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adapt/beagleboard/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/beagleboard/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="beagleboard" name="Beagle Board" levels="hw-if">
+    <collection id="omap3530" name="OMAP 3530" level="hw-if">
+      <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+        <unit bldFile="omap3530" mrp="omap3530/base_beagle.mrp"/>
+      </component>
+      <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+        <unit bldFile="omap3530/kernel"/>
+      </component>
+      <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+        <unit bldFile="omap3530/beagleboard"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adapt/beagleboard/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/beagleboard/sources.csv	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,RCL_3,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adapt/codecs.aricent/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/codecs.aricent/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="codecs.aricent" name="Aricent Codecs">
+    <collection id="utilities" name="Aricent Utilities">
+      <component id="ariprocessengine" name="Aricent Process Engine">
+        <unit bldFile="utilities/ariprocessengine/group" />
+      </component>
+      <component id="aristatemachine" name="Aricent State Machine">
+        <unit bldFile="utilities/aristatemachine/group" />
+      </component>
+    </collection>
+    <collection id="aaclc_enc" level="plugin">
+      <component id="ariaaclcencmmfcodec">
+        <unit bldFile="aaclc_enc/ariaaclcencmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="amrnb_dec" level="plugin">
+      <component id="ariamrnbdecmmfcodec">
+        <unit bldFile="amrnb_dec/ariamrnbdecmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="amrnb_enc" level="plugin">
+      <component id="ariamrnbencmmfcodec">
+        <unit bldFile="amrnb_enc/ariamrnbencmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="amrwb_dec" level="plugin">
+      <component id="ariamrwbdecmmfcodec">
+        <unit bldFile="amrwb_dec/ariamrwbdecmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="h264_dec" level="plugin">
+      <component id="arih264dechwdevice">
+        <unit bldFile="h264_dec/arih264dechwdevice/group" />
+      </component>
+    </collection>
+    <collection id="h264_enc" level="plugin">
+      <component id="arih264enchwdevice">
+        <unit bldFile="h264_enc/arih264enchwdevice/group" />
+      </component>
+    </collection>
+    <collection id="heaac_dec" level="plugin">
+      <component id="ariheaacdecmmfcodec">
+        <unit bldFile="heaac_dec/ariheaacdecmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="mp3_dec" level="plugin">
+      <component id="arimp3decmmfcodec">
+        <unit bldFile="mp3_dec/arimp3decmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="mp4asp_dec" level="plugin">
+      <component id="arimpeg4aspdechwdevice">
+        <unit bldFile="mp4asp_dec/arimpeg4aspdechwdevice/group" />
+      </component>
+    </collection>
+    <collection id="mp4sp_enc" level="plugin">
+      <component id="arimp4spenchwdevice">
+        <unit bldFile="mp4sp_enc/arimp4spenchwdevice/group" />
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
\ No newline at end of file
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adapt/codecs.aricent/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/codecs.aricent/sources.csv	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/MCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adapt/qemu/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/qemu/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="qemu" name="QEMU and Baseport" levels="hw-if">
+    <collection id="qemu_baseport" name="Baseport" level="hw-if">
+      <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+        <unit bldFile="baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adapt/qemu/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/qemu/sources.csv	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,3 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adapt/stubs/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/stubs/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="stubs" name="Stubs" levels="stub">
+    <collection id="s60_stubs" level="stub">
+     <component id="audiostubs" name="Audio Stubs">
+      <unit bldFile="audiostubs/group"/>
+     </component>
+     <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
+      <unit bldFile="btaudioadaptation_stub/group"/>
+     </component>
+     <component id="drm_stubs" name="DRM Stubs">
+      <unit bldFile="drm_stubs/group"/>
+     </component>
+     <component id="ocrsrv_stub" name="OCR Services Stub">
+      <unit bldFile="ocrsrv_stub/group"/>
+     </component>
+     <component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
+      <unit bldFile="omasuplasnconverterstubimpl/group"/>
+     </component>
+     <component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
+      <unit bldFile="posmsgpluginreferenceimpl/group"/>
+     </component>
+     <component id="srsfenginestub" name="SRSF Engine Stub">
+      <unit bldFile="srsfenginestub/group"/>
+     </component>
+     <component id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
+      <unit bldFile="power_save_display_mode_stub/group"/>
+     </component>
+     <component id="systemswstubs" name="System Software Stubs">
+      <unit bldFile="systemswstubs/group"/>
+     </component>
+     <component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
+      <unit bldFile="tactileclickplugin_stub/group"/>
+     </component>
+     <component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
+      <unit bldFile="wlanhwinit_stub/group"/>
+     </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adapt/stubs/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/stubs/sources.csv	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,RCL_3,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adaptation/beagleboard/package_definition.xml
--- a/symbian3/adaptation/beagleboard/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="beagleboard" name="Beagle Board" levels="hw-if">
-    <collection id="omap3530" name="OMAP 3530" level="hw-if">
-      <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-        <unit bldFile="omap3530" mrp="omap3530/base_beagle.mrp"/>
-      </component>
-      <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-        <unit bldFile="omap3530/kernel"/>
-      </component>
-      <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-        <unit bldFile="omap3530/beagleboard"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adaptation/beagleboard/sources.csv
--- a/symbian3/adaptation/beagleboard/sources.csv	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,RCL_3,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adaptation/codecs.aricent/package_definition.xml
--- a/symbian3/adaptation/codecs.aricent/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="codecs.aricent" name="Aricent Codecs">
-    <collection id="utilities" name="Aricent Utilities">
-      <component id="ariprocessengine" name="Aricent Process Engine">
-        <unit bldFile="utilities/ariprocessengine/group" />
-      </component>
-      <component id="aristatemachine" name="Aricent State Machine">
-        <unit bldFile="utilities/aristatemachine/group" />
-      </component>
-    </collection>
-    <collection id="aaclc_enc" level="plugin">
-      <component id="ariaaclcencmmfcodec">
-        <unit bldFile="aaclc_enc/ariaaclcencmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="amrnb_dec" level="plugin">
-      <component id="ariamrnbdecmmfcodec">
-        <unit bldFile="amrnb_dec/ariamrnbdecmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="amrnb_enc" level="plugin">
-      <component id="ariamrnbencmmfcodec">
-        <unit bldFile="amrnb_enc/ariamrnbencmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="amrwb_dec" level="plugin">
-      <component id="ariamrwbdecmmfcodec">
-        <unit bldFile="amrwb_dec/ariamrwbdecmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="h264_dec" level="plugin">
-      <component id="arih264dechwdevice">
-        <unit bldFile="h264_dec/arih264dechwdevice/group" />
-      </component>
-    </collection>
-    <collection id="h264_enc" level="plugin">
-      <component id="arih264enchwdevice">
-        <unit bldFile="h264_enc/arih264enchwdevice/group" />
-      </component>
-    </collection>
-    <collection id="heaac_dec" level="plugin">
-      <component id="ariheaacdecmmfcodec">
-        <unit bldFile="heaac_dec/ariheaacdecmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="mp3_dec" level="plugin">
-      <component id="arimp3decmmfcodec">
-        <unit bldFile="mp3_dec/arimp3decmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="mp4asp_dec" level="plugin">
-      <component id="arimpeg4aspdechwdevice">
-        <unit bldFile="mp4asp_dec/arimpeg4aspdechwdevice/group" />
-      </component>
-    </collection>
-    <collection id="mp4sp_enc" level="plugin">
-      <component id="arimp4spenchwdevice">
-        <unit bldFile="mp4sp_enc/arimp4spenchwdevice/group" />
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
\ No newline at end of file
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adaptation/codecs.aricent/sources.csv
--- a/symbian3/adaptation/codecs.aricent/sources.csv	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adaptation/qemu/package_definition.xml
--- a/symbian3/adaptation/qemu/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="qemu" name="QEMU and Baseport" levels="hw-if">
-    <collection id="qemu_baseport" name="Baseport" level="hw-if">
-      <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-        <unit bldFile="baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adaptation/qemu/sources.csv
--- a/symbian3/adaptation/qemu/sources.csv	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adaptation/stubs/package_definition.xml
--- a/symbian3/adaptation/stubs/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="stubs" name="Stubs" levels="stub">
-    <collection id="s60_stubs" level="stub">
-     <component id="audiostubs" name="Audio Stubs">
-      <unit bldFile="audiostubs/group"/>
-     </component>
-     <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
-      <unit bldFile="btaudioadaptation_stub/group"/>
-     </component>
-     <component id="drm_stubs" name="DRM Stubs">
-      <unit bldFile="drm_stubs/group"/>
-     </component>
-     <component id="ocrsrv_stub" name="OCR Services Stub">
-      <unit bldFile="ocrsrv_stub/group"/>
-     </component>
-     <component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
-      <unit bldFile="omasuplasnconverterstubimpl/group"/>
-     </component>
-     <component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
-      <unit bldFile="posmsgpluginreferenceimpl/group"/>
-     </component>
-     <component id="srsfenginestub" name="SRSF Engine Stub">
-      <unit bldFile="srsfenginestub/group"/>
-     </component>
-     <component id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
-      <unit bldFile="power_save_display_mode_stub/group"/>
-     </component>
-     <component id="systemswstubs" name="System Software Stubs">
-      <unit bldFile="systemswstubs/group"/>
-     </component>
-     <component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
-      <unit bldFile="tactileclickplugin_stub/group"/>
-     </component>
-     <component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
-      <unit bldFile="wlanhwinit_stub/group"/>
-     </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/adaptation/stubs/sources.csv
--- a/symbian3/adaptation/stubs/sources.csv	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
diff -r de72397f4a22 -r 176abb8bf3a6 symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -101,10 +101,10 @@
 <SystemDefinition schema="3.0.0">
   <systemModel name="Symbian^3">
     <layer id="adaptation" name="Adaptation" levels="low mw high">
-      <package id="stubs" tech-domain="hb" level="high" href="../../../../adaptation/stubs/package_definition.xml"/>
-      <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adaptation/beagleboard/package_definition.xml"/>
-      <package id="qemu" tech-domain="hb" level="low" href="../../../../adaptation/qemu/package_definition.xml"/>
-      <package id="codecs.aricent" tech-domain="mm" level="low" href="../../../../adaptation/codecs.aricent/package_definition.xml" />
+      <package id="stubs" tech-domain="hb" level="high" href="../../../../adapt/stubs/package_definition.xml"/>
+      <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adapt/beagleboard/package_definition.xml"/>
+      <package id="qemu" tech-domain="hb" level="low" href="../../../../adapt/qemu/package_definition.xml"/>
+      <package id="codecs.aricent" tech-domain="mm" level="low" href="../../../../adapt/codecs.aricent/package_definition.xml" />
     </layer>
     <layer id="os" name="OS" levels="hw services">
       <package id="kernelhwsrv" level="hw" tech-domain="hb" href="../../../../os/kernelhwsrv/package_definition.xml"/>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian4/adapt/beagleboard/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/beagleboard/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="beagleboard" name="Beagle Board" levels="hw-if">
+    <collection id="omap3530" name="OMAP 3530" level="hw-if">
+      <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+        <unit bldFile="omap3530" mrp="omap3530/base_beagle.mrp"/>
+      </component>
+      <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+        <unit bldFile="omap3530/kernel"/>
+      </component>
+      <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+        <unit bldFile="omap3530/beagleboard"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian4/adapt/codecs.aricent/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/codecs.aricent/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="codecs.aricent" name="Aricent Codecs">
+    <collection id="utilities" name="Aricent Utilities">
+      <component id="ariprocessengine" name="Aricent Process Engine">
+        <unit bldFile="utilities/ariprocessengine/group" />
+      </component>
+      <component id="aristatemachine" name="Aricent State Machine">
+        <unit bldFile="utilities/aristatemachine/group" />
+      </component>
+    </collection>
+    <collection id="aaclc_enc" level="plugin">
+      <component id="ariaaclcencmmfcodec">
+        <unit bldFile="aaclc_enc/ariaaclcencmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="amrnb_dec" level="plugin">
+      <component id="ariamrnbdecmmfcodec">
+        <unit bldFile="amrnb_dec/ariamrnbdecmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="amrnb_enc" level="plugin">
+      <component id="ariamrnbencmmfcodec">
+        <unit bldFile="amrnb_enc/ariamrnbencmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="amrwb_dec" level="plugin">
+      <component id="ariamrwbdecmmfcodec">
+        <unit bldFile="amrwb_dec/ariamrwbdecmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="h264_dec" level="plugin">
+      <component id="arih264dechwdevice">
+        <unit bldFile="h264_dec/arih264dechwdevice/group" />
+      </component>
+    </collection>
+    <collection id="h264_enc" level="plugin">
+      <component id="arih264enchwdevice">
+        <unit bldFile="h264_enc/arih264enchwdevice/group" />
+      </component>
+    </collection>
+    <collection id="heaac_dec" level="plugin">
+      <component id="ariheaacdecmmfcodec">
+        <unit bldFile="heaac_dec/ariheaacdecmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="mp3_dec" level="plugin">
+      <component id="arimp3decmmfcodec">
+        <unit bldFile="mp3_dec/arimp3decmmfcodec/group" />
+      </component>
+    </collection>
+    <collection id="mp4asp_dec" level="plugin">
+      <component id="arimpeg4aspdechwdevice">
+        <unit bldFile="mp4asp_dec/arimpeg4aspdechwdevice/group" />
+      </component>
+    </collection>
+    <collection id="mp4sp_enc" level="plugin">
+      <component id="arimp4spenchwdevice">
+        <unit bldFile="mp4sp_enc/arimp4spenchwdevice/group" />
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
\ No newline at end of file
diff -r de72397f4a22 -r 176abb8bf3a6 symbian4/adapt/qemu/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/qemu/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="qemu" name="QEMU and Baseport" levels="hw-if">
+    <collection id="qemu_baseport" name="Baseport" level="hw-if">
+      <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+        <unit bldFile="baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian4/adapt/stubs/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/stubs/package_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="stubs" name="Stubs" levels="adaptation plugin mid engine">
+    <collection id="audiostubs" name="Audio Stubs" level="adaptation">
+     <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
+      <unit bldFile="audiostubs/devsoundextensions_stubs/group"/>
+     </component>
+     <component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub">
+      <unit bldFile="audiostubs/fmradiotunercontrolstub/group"/>
+     </component>
+    </collection>
+   <collection id="drm_stubs" name="DRM Stubs" level="plugin">
+     <component id="drm_stubs_build" name="DRM Stubs Build">
+      <unit bldFile="drm_stubs/group"/>
+     </component>
+    </collection>
+    <collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
+     <component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build">
+      <unit bldFile="ocrsrv_stub/group"/>
+     </component>
+    </collection>
+    <collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
+	 <component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
+      <unit bldFile="omasuplasnconverterstubimpl/group"/>
+     </component>
+    </collection>
+    <collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
+     <component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin">
+      <unit bldFile="posmsgpluginreferenceimpl/group"/>
+     </component>
+    </collection>
+    <collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
+     <component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs">
+	    <unit bldFile="srsfenginestub/group"/>
+     </component>
+    </collection>
+    <collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
+     <component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build">
+      <unit bldFile="power_save_display_mode_stub/group"/>
+     </component>
+    </collection>
+    <collection id="systemswstubs" name="System Software Stubs" level="adaptation">
+     <component id="ddcaccessstub" name="DDC Access Stub">
+      <unit bldFile="systemswstubs/ddcaccessstub/group"/>
+     </component>
+     <component id="tvoutconfig" name="TV Out Config">
+      <unit bldFile="systemswstubs/TVOutConfig/group" filter="oem_build"/>
+     </component>
+     <component id="accessorypolicyreference" name="Accessory Policy Reference">
+ 	  <meta rel="config">
+         <defined condition="__ACCESSORY_FW"/>
+       </meta>
+      <unit bldFile="systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+     </component>
+     <component id="asyreference" name="ASY Reference" class="plugin">
+ 	  <meta rel="config">
+         <defined condition="__ACCESSORY_FW"/>
+       </meta>
+      <unit bldFile="systemswstubs/asyreference/group" filter="oem_build"/>
+     </component>
+     <component id="examplecommonisc" name="Example Common ISC">
+      <unit bldFile="systemswstubs/examplecommonisc/group" filter="oem_build"/>
+     </component>
+     <component id="exampledsy" name="Example DSY">
+ 	  <meta rel="config">
+         <defined condition="RD_STARTUP_CHANGE"/>
+       </meta>
+      <unit bldFile="systemswstubs/exampledsy/group" filter="oem_build"/>
+     </component>
+     <component id="featuremanagerstub" name="Feature Manager Stub">
+      <unit bldFile="systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+     </component>
+     <component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin">
+      <unit bldFile="systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+     </component>
+     <component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin">
+      <unit bldFile="systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+     </component>
+     <component id="sensorchannelsreference" name="Sensor Channels Reference">
+      <unit bldFile="systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+     </component>
+     <component id="ssyreference" name="SSY Reference" class="plugin">
+ 	  <meta rel="config">
+         <defined condition="RD_SENSOR_FW"/>
+       </meta>
+      <unit bldFile="systemswstubs/ssyreference/group" filter="oem_build"/>
+     </component>
+     <component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin">
+      <unit bldFile="systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+     </component>
+     <component id="tiltcompensationstub" name="Tilt Compensation Stub">
+      <unit bldFile="systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+     </component>
+     <component id="tvoutbehaviour" name="TV Out Behaviour">
+      <unit bldFile="systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+     </component>
+     <component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin">
+      <unit bldFile="systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+     </component>
+    </collection>
+    <collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
+ 	  <meta rel="config">
+         <defined condition="RD_TACTILE_FEEDBACK"/>
+       </meta>
+     <component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin">
+      <unit bldFile="tactileclickplugin_stub/group"/>
+     </component>
+    </collection>
+    <collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
+     <component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build">
+      <unit bldFile="wlanhwinit_stub/group"/>
+     </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian4/adaptation/beagleboard/package_definition.xml
--- a/symbian4/adaptation/beagleboard/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="beagleboard" name="Beagle Board" levels="hw-if">
-    <collection id="omap3530" name="OMAP 3530" level="hw-if">
-      <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-        <unit bldFile="omap3530" mrp="omap3530/base_beagle.mrp"/>
-      </component>
-      <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-        <unit bldFile="omap3530/kernel"/>
-      </component>
-      <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-        <unit bldFile="omap3530/beagleboard"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian4/adaptation/codecs.aricent/package_definition.xml
--- a/symbian4/adaptation/codecs.aricent/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="codecs.aricent" name="Aricent Codecs">
-    <collection id="utilities" name="Aricent Utilities">
-      <component id="ariprocessengine" name="Aricent Process Engine">
-        <unit bldFile="utilities/ariprocessengine/group" />
-      </component>
-      <component id="aristatemachine" name="Aricent State Machine">
-        <unit bldFile="utilities/aristatemachine/group" />
-      </component>
-    </collection>
-    <collection id="aaclc_enc" level="plugin">
-      <component id="ariaaclcencmmfcodec">
-        <unit bldFile="aaclc_enc/ariaaclcencmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="amrnb_dec" level="plugin">
-      <component id="ariamrnbdecmmfcodec">
-        <unit bldFile="amrnb_dec/ariamrnbdecmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="amrnb_enc" level="plugin">
-      <component id="ariamrnbencmmfcodec">
-        <unit bldFile="amrnb_enc/ariamrnbencmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="amrwb_dec" level="plugin">
-      <component id="ariamrwbdecmmfcodec">
-        <unit bldFile="amrwb_dec/ariamrwbdecmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="h264_dec" level="plugin">
-      <component id="arih264dechwdevice">
-        <unit bldFile="h264_dec/arih264dechwdevice/group" />
-      </component>
-    </collection>
-    <collection id="h264_enc" level="plugin">
-      <component id="arih264enchwdevice">
-        <unit bldFile="h264_enc/arih264enchwdevice/group" />
-      </component>
-    </collection>
-    <collection id="heaac_dec" level="plugin">
-      <component id="ariheaacdecmmfcodec">
-        <unit bldFile="heaac_dec/ariheaacdecmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="mp3_dec" level="plugin">
-      <component id="arimp3decmmfcodec">
-        <unit bldFile="mp3_dec/arimp3decmmfcodec/group" />
-      </component>
-    </collection>
-    <collection id="mp4asp_dec" level="plugin">
-      <component id="arimpeg4aspdechwdevice">
-        <unit bldFile="mp4asp_dec/arimpeg4aspdechwdevice/group" />
-      </component>
-    </collection>
-    <collection id="mp4sp_enc" level="plugin">
-      <component id="arimp4spenchwdevice">
-        <unit bldFile="mp4sp_enc/arimp4spenchwdevice/group" />
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
\ No newline at end of file
diff -r de72397f4a22 -r 176abb8bf3a6 symbian4/adaptation/qemu/package_definition.xml
--- a/symbian4/adaptation/qemu/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="qemu" name="QEMU and Baseport" levels="hw-if">
-    <collection id="qemu_baseport" name="Baseport" level="hw-if">
-      <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-        <unit bldFile="baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian4/adaptation/stubs/package_definition.xml
--- a/symbian4/adaptation/stubs/package_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="stubs" name="Stubs" levels="adaptation plugin mid engine">
-    <collection id="audiostubs" name="Audio Stubs" level="adaptation">
-     <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
-      <unit bldFile="audiostubs/devsoundextensions_stubs/group"/>
-     </component>
-     <component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub">
-      <unit bldFile="audiostubs/fmradiotunercontrolstub/group"/>
-     </component>
-    </collection>
-   <collection id="drm_stubs" name="DRM Stubs" level="plugin">
-     <component id="drm_stubs_build" name="DRM Stubs Build">
-      <unit bldFile="drm_stubs/group"/>
-     </component>
-    </collection>
-    <collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
-     <component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build">
-      <unit bldFile="ocrsrv_stub/group"/>
-     </component>
-    </collection>
-    <collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-	 <component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-      <unit bldFile="omasuplasnconverterstubimpl/group"/>
-     </component>
-    </collection>
-    <collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
-     <component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin">
-      <unit bldFile="posmsgpluginreferenceimpl/group"/>
-     </component>
-    </collection>
-    <collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
-     <component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs">
-	    <unit bldFile="srsfenginestub/group"/>
-     </component>
-    </collection>
-    <collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
-     <component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build">
-      <unit bldFile="power_save_display_mode_stub/group"/>
-     </component>
-    </collection>
-    <collection id="systemswstubs" name="System Software Stubs" level="adaptation">
-     <component id="ddcaccessstub" name="DDC Access Stub">
-      <unit bldFile="systemswstubs/ddcaccessstub/group"/>
-     </component>
-     <component id="tvoutconfig" name="TV Out Config">
-      <unit bldFile="systemswstubs/TVOutConfig/group" filter="oem_build"/>
-     </component>
-     <component id="accessorypolicyreference" name="Accessory Policy Reference">
- 	  <meta rel="config">
-         <defined condition="__ACCESSORY_FW"/>
-       </meta>
-      <unit bldFile="systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-     </component>
-     <component id="asyreference" name="ASY Reference" class="plugin">
- 	  <meta rel="config">
-         <defined condition="__ACCESSORY_FW"/>
-       </meta>
-      <unit bldFile="systemswstubs/asyreference/group" filter="oem_build"/>
-     </component>
-     <component id="examplecommonisc" name="Example Common ISC">
-      <unit bldFile="systemswstubs/examplecommonisc/group" filter="oem_build"/>
-     </component>
-     <component id="exampledsy" name="Example DSY">
- 	  <meta rel="config">
-         <defined condition="RD_STARTUP_CHANGE"/>
-       </meta>
-      <unit bldFile="systemswstubs/exampledsy/group" filter="oem_build"/>
-     </component>
-     <component id="featuremanagerstub" name="Feature Manager Stub">
-      <unit bldFile="systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-     </component>
-     <component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin">
-      <unit bldFile="systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-     </component>
-     <component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin">
-      <unit bldFile="systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-     </component>
-     <component id="sensorchannelsreference" name="Sensor Channels Reference">
-      <unit bldFile="systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-     </component>
-     <component id="ssyreference" name="SSY Reference" class="plugin">
- 	  <meta rel="config">
-         <defined condition="RD_SENSOR_FW"/>
-       </meta>
-      <unit bldFile="systemswstubs/ssyreference/group" filter="oem_build"/>
-     </component>
-     <component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin">
-      <unit bldFile="systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-     </component>
-     <component id="tiltcompensationstub" name="Tilt Compensation Stub">
-      <unit bldFile="systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-     </component>
-     <component id="tvoutbehaviour" name="TV Out Behaviour">
-      <unit bldFile="systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-     </component>
-     <component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin">
-      <unit bldFile="systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-     </component>
-    </collection>
-    <collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
- 	  <meta rel="config">
-         <defined condition="RD_TACTILE_FEEDBACK"/>
-       </meta>
-     <component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin">
-      <unit bldFile="tactileclickplugin_stub/group"/>
-     </component>
-    </collection>
-    <collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
-     <component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build">
-      <unit bldFile="wlanhwinit_stub/group"/>
-     </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r de72397f4a22 -r 176abb8bf3a6 symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue Aug 24 13:51:15 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue Aug 24 15:19:44 2010 +0100
@@ -104,10 +104,10 @@
 <SystemDefinition schema="3.0.1">
   <systemModel name="Symbian^4">
     <layer id="adaptation" name="Adaptation" levels="low mw high">
-      <package id="stubs" tech-domain="hb" level="high" span="2"  href="../../../../adaptation/stubs/package_definition.xml"/>
-      <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adaptation/beagleboard/package_definition.xml"/>
-      <package id="qemu" tech-domain="hb" level="low" href="../../../../adaptation/qemu/package_definition.xml"/>
-      <package id="codecs.aricent" tech-domain="mm" level="low" href="../../../../adaptation/codecs.aricent/package_definition.xml" />
+      <package id="stubs" tech-domain="hb" level="high" span="2"  href="../../../../adapt/stubs/package_definition.xml"/>
+      <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adapt/beagleboard/package_definition.xml"/>
+      <package id="qemu" tech-domain="hb" level="low" href="../../../../adapt/qemu/package_definition.xml"/>
+      <package id="codecs.aricent" tech-domain="mm" level="low" href="../../../../adapt/codecs.aricent/package_definition.xml" />
     </layer>
     <layer id="os" name="OS" levels="hw services">
       <package id="kernelhwsrv" level="hw" tech-domain="hb" href="../../../../os/kernelhwsrv/package_definition.xml"/>