Update references of "/adaptation" with "/adapt", and move offending directories.
authorTyson Key <tyson.key@symbiandevco.org>
Tue, 24 Aug 2010 14:58:19 +0100
changeset 363 33a4b8280500
parent 361 e1a3c78941f2
Update references of "/adaptation" with "/adapt", and move offending directories.
CompilerCompatibility/adapt/beagleboard/package_definition.xml
CompilerCompatibility/adapt/beagleboard/sources.csv
CompilerCompatibility/adapt/codecs.aricent/package_definition.xml
CompilerCompatibility/adapt/qemu/package_definition.xml
CompilerCompatibility/adapt/qemu/sources.csv
CompilerCompatibility/adapt/stubs/package_definition.xml
CompilerCompatibility/adapt/stubs/sources.csv
CompilerCompatibility/adaptation/beagleboard/package_definition.xml
CompilerCompatibility/adaptation/beagleboard/sources.csv
CompilerCompatibility/adaptation/codecs.aricent/package_definition.xml
CompilerCompatibility/adaptation/qemu/package_definition.xml
CompilerCompatibility/adaptation/qemu/sources.csv
CompilerCompatibility/adaptation/stubs/package_definition.xml
CompilerCompatibility/adaptation/stubs/sources.csv
symbian3/adapt/beagleboard/package_definition.xml
symbian3/adapt/beagleboard/sources.csv
symbian3/adapt/codecs.aricent/package_definition.xml
symbian3/adapt/qemu/package_definition.xml
symbian3/adapt/qemu/sources.csv
symbian3/adapt/stubs/package_definition.xml
symbian3/adapt/stubs/sources.csv
symbian3/adaptation/beagleboard/package_definition.xml
symbian3/adaptation/beagleboard/sources.csv
symbian3/adaptation/codecs.aricent/package_definition.xml
symbian3/adaptation/qemu/package_definition.xml
symbian3/adaptation/qemu/sources.csv
symbian3/adaptation/stubs/package_definition.xml
symbian3/adaptation/stubs/sources.csv
symbian4/adapt/beagleboard/package_definition.xml
symbian4/adapt/beagleboard/sources.csv
symbian4/adapt/codecs.aricent/package_definition.xml
symbian4/adapt/qemu/package_definition.xml
symbian4/adapt/qemu/sources.csv
symbian4/adapt/stubs/package_definition.xml
symbian4/adapt/stubs/sources.csv
symbian4/adaptation/beagleboard/package_definition.xml
symbian4/adaptation/beagleboard/sources.csv
symbian4/adaptation/codecs.aricent/package_definition.xml
symbian4/adaptation/qemu/package_definition.xml
symbian4/adaptation/qemu/sources.csv
symbian4/adaptation/stubs/package_definition.xml
symbian4/adaptation/stubs/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/beagleboard/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
+<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
+<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+</component>
+<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
+</component>
+<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/beagleboard/sources.csv	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,3 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,CompilerCompatibility,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,CompilerCompatibility,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/codecs.aricent/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
+<collection name="utilities" long-name="Aricent Utilities">
+<component name="ariprocessengine" long-name="Aricent Process Engine">
+<unit bldFile="/sf/adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+</component>
+<component name="aristatemachine" long-name="Aricent State Machine">
+<unit bldFile="/sf/adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+</component>
+</collection>
+<collection name="aaclc_enc" level="plugin">
+<component name="ariaaclcencmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrnb_dec" level="plugin">
+<component name="ariamrnbdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrnb_enc" level="plugin">
+<component name="ariamrnbencmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrwb_dec" level="plugin">
+<component name="ariamrwbdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="h264_dec" level="plugin">
+<component name="arih264dechwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+</component>
+</collection>
+<collection name="h264_enc" level="plugin">
+<component name="arih264enchwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+</component>
+</collection>
+<collection name="heaac_dec" level="plugin">
+<component name="ariheaacdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="mp3_dec" level="plugin">
+<component name="arimp3decmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+</component>
+</collection>
+<collection name="mp4asp_dec" level="plugin">
+<component name="arimpeg4aspdechwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+</component>
+</collection>
+<collection name="mp4sp_enc" level="plugin">
+<component name="arimp4spenchwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/qemu/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
+<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
+<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+<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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/qemu/sources.csv	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,3 @@
+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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/stubs/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="stubs" level="high" long-name="Stubs" levels="stub">
+<collection name="s60_stubs" level="stub">
+<component name="audiostubs" long-name="Audio Stubs">
+<unit bldFile="/sf/adaptation/stubs/audiostubs/group"/>
+</component>
+<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
+<unit bldFile="/sf/adaptation/stubs/btaudioadaptation_stub/group"/>
+</component>
+<component name="drm_stubs" long-name="DRM Stubs">
+<unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
+</component>
+<component name="ocrsrv_stub" long-name="OCR Services Stub">
+<unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
+</component>
+<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
+<unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+</component>
+<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+</component>
+<component name="srsfenginestub" long-name="SRSF Engine Stub">
+<unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
+</component>
+<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
+<unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
+</component>
+<component name="systemswstubs" long-name="System Software Stubs">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/group"/>
+</component>
+<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
+</component>
+<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
+<unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/stubs/sources.csv	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,CompilerCompatibility,layers.sysdef.xml
--- a/CompilerCompatibility/adaptation/beagleboard/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file
--- a/CompilerCompatibility/adaptation/beagleboard/sources.csv	Thu Aug 19 18:52:09 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/beagleboard/,/sf/adaptation/beagleboard,branch,CompilerCompatibility,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,CompilerCompatibility,
--- a/CompilerCompatibility/adaptation/codecs.aricent/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
-<collection name="utilities" long-name="Aricent Utilities">
-<component name="ariprocessengine" long-name="Aricent Process Engine">
-<unit bldFile="/sf/adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
-</component>
-<component name="aristatemachine" long-name="Aricent State Machine">
-<unit bldFile="/sf/adaptation/codecs.aricent/utilities/aristatemachine/group"/>
-</component>
-</collection>
-<collection name="aaclc_enc" level="plugin">
-<component name="ariaaclcencmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
-</component>
-</collection>
-<collection name="amrnb_dec" level="plugin">
-<component name="ariamrnbdecmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
-</component>
-</collection>
-<collection name="amrnb_enc" level="plugin">
-<component name="ariamrnbencmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
-</component>
-</collection>
-<collection name="amrwb_dec" level="plugin">
-<component name="ariamrwbdecmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
-</component>
-</collection>
-<collection name="h264_dec" level="plugin">
-<component name="arih264dechwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
-</component>
-</collection>
-<collection name="h264_enc" level="plugin">
-<component name="arih264enchwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
-</component>
-</collection>
-<collection name="heaac_dec" level="plugin">
-<component name="ariheaacdecmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
-</component>
-</collection>
-<collection name="mp3_dec" level="plugin">
-<component name="arimp3decmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
-</component>
-</collection>
-<collection name="mp4asp_dec" level="plugin">
-<component name="arimpeg4aspdechwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
-</component>
-</collection>
-<collection name="mp4sp_enc" level="plugin">
-<component name="arimp4spenchwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file
--- a/CompilerCompatibility/adaptation/qemu/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<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
--- a/CompilerCompatibility/adaptation/qemu/sources.csv	Thu Aug 19 18:52:09 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
--- a/CompilerCompatibility/adaptation/stubs/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="/sf/adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="/sf/adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file
--- a/CompilerCompatibility/adaptation/stubs/sources.csv	Thu Aug 19 18:52:09 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/beagleboard/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
+<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
+<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+</component>
+<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
+</component>
+<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/beagleboard/sources.csv	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,3 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/codecs.aricent/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
+<collection name="utilities" long-name="Aricent Utilities">
+<component name="ariprocessengine" long-name="Aricent Process Engine">
+<unit bldFile="/sf/adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+</component>
+<component name="aristatemachine" long-name="Aricent State Machine">
+<unit bldFile="/sf/adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+</component>
+</collection>
+<collection name="aaclc_enc" level="plugin">
+<component name="ariaaclcencmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrnb_dec" level="plugin">
+<component name="ariamrnbdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrnb_enc" level="plugin">
+<component name="ariamrnbencmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrwb_dec" level="plugin">
+<component name="ariamrwbdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="h264_dec" level="plugin">
+<component name="arih264dechwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+</component>
+</collection>
+<collection name="h264_enc" level="plugin">
+<component name="arih264enchwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+</component>
+</collection>
+<collection name="heaac_dec" level="plugin">
+<component name="ariheaacdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="mp3_dec" level="plugin">
+<component name="arimp3decmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+</component>
+</collection>
+<collection name="mp4asp_dec" level="plugin">
+<component name="arimpeg4aspdechwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+</component>
+</collection>
+<collection name="mp4sp_enc" level="plugin">
+<component name="arimp4spenchwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/qemu/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
+<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
+<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+<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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/qemu/sources.csv	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,3 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/stubs/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="stubs" level="high" long-name="Stubs" levels="stub">
+<collection name="s60_stubs" level="stub">
+<component name="audiostubs" long-name="Audio Stubs">
+<unit bldFile="/sf/adaptation/stubs/audiostubs/group"/>
+</component>
+<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
+<unit bldFile="/sf/adaptation/stubs/btaudioadaptation_stub/group"/>
+</component>
+<component name="drm_stubs" long-name="DRM Stubs">
+<unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
+</component>
+<component name="ocrsrv_stub" long-name="OCR Services Stub">
+<unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
+</component>
+<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
+<unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+</component>
+<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+</component>
+<component name="srsfenginestub" long-name="SRSF Engine Stub">
+<unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
+</component>
+<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
+<unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
+</component>
+<component name="systemswstubs" long-name="System Software Stubs">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/group"/>
+</component>
+<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
+</component>
+<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
+<unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/stubs/sources.csv	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
--- a/symbian3/adaptation/beagleboard/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file
--- a/symbian3/adaptation/beagleboard/sources.csv	Thu Aug 19 18:52:09 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/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,
--- a/symbian3/adaptation/codecs.aricent/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
-<collection name="utilities" long-name="Aricent Utilities">
-<component name="ariprocessengine" long-name="Aricent Process Engine">
-<unit bldFile="/sf/adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
-</component>
-<component name="aristatemachine" long-name="Aricent State Machine">
-<unit bldFile="/sf/adaptation/codecs.aricent/utilities/aristatemachine/group"/>
-</component>
-</collection>
-<collection name="aaclc_enc" level="plugin">
-<component name="ariaaclcencmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
-</component>
-</collection>
-<collection name="amrnb_dec" level="plugin">
-<component name="ariamrnbdecmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
-</component>
-</collection>
-<collection name="amrnb_enc" level="plugin">
-<component name="ariamrnbencmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
-</component>
-</collection>
-<collection name="amrwb_dec" level="plugin">
-<component name="ariamrwbdecmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
-</component>
-</collection>
-<collection name="h264_dec" level="plugin">
-<component name="arih264dechwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
-</component>
-</collection>
-<collection name="h264_enc" level="plugin">
-<component name="arih264enchwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
-</component>
-</collection>
-<collection name="heaac_dec" level="plugin">
-<component name="ariheaacdecmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
-</component>
-</collection>
-<collection name="mp3_dec" level="plugin">
-<component name="arimp3decmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
-</component>
-</collection>
-<collection name="mp4asp_dec" level="plugin">
-<component name="arimpeg4aspdechwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
-</component>
-</collection>
-<collection name="mp4sp_enc" level="plugin">
-<component name="arimp4spenchwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file
--- a/symbian3/adaptation/qemu/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<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
--- a/symbian3/adaptation/qemu/sources.csv	Thu Aug 19 18:52:09 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,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
--- a/symbian3/adaptation/stubs/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="stubs" level="high" long-name="Stubs" levels="stub">
-<collection name="s60_stubs" level="stub">
-<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="/sf/adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="/sf/adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
-</component>
-<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
-</component>
-<component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-<component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/group"/>
-</component>
-<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file
--- a/symbian3/adaptation/stubs/sources.csv	Thu Aug 19 18:52:09 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/beagleboard/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^4" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
+<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
+<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+</component>
+<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
+</component>
+<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/beagleboard/sources.csv	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/codecs.aricent/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^4" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
+<collection name="utilities" long-name="Aricent Utilities">
+<component name="ariprocessengine" long-name="Aricent Process Engine">
+<unit bldFile="/sf/adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+</component>
+<component name="aristatemachine" long-name="Aricent State Machine">
+<unit bldFile="/sf/adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+</component>
+</collection>
+<collection name="aaclc_enc" level="plugin">
+<component name="ariaaclcencmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrnb_dec" level="plugin">
+<component name="ariamrnbdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrnb_enc" level="plugin">
+<component name="ariamrnbencmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrwb_dec" level="plugin">
+<component name="ariamrwbdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="h264_dec" level="plugin">
+<component name="arih264dechwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+</component>
+</collection>
+<collection name="h264_enc" level="plugin">
+<component name="arih264enchwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+</component>
+</collection>
+<collection name="heaac_dec" level="plugin">
+<component name="ariheaacdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="mp3_dec" level="plugin">
+<component name="arimp3decmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+</component>
+</collection>
+<collection name="mp4asp_dec" level="plugin">
+<component name="arimpeg4aspdechwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+</component>
+</collection>
+<collection name="mp4sp_enc" level="plugin">
+<component name="arimp4spenchwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/qemu/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^4" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
+<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
+<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+<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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/qemu/sources.csv	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/stubs/package_definition.xml	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^4" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
+<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
+<unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+</component>
+<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
+<unit bldFile="/sf/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+</component>
+</collection>
+<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
+<component name="drm_stubs_build" long-name="DRM Stubs Build">
+<unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
+</component>
+</collection>
+<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
+<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
+<unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
+</component>
+</collection>
+<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
+<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
+<unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+</component>
+</collection>
+<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
+<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+</component>
+</collection>
+<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
+<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
+<unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
+</component>
+</collection>
+<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
+<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
+<unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
+</component>
+</collection>
+<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<component name="ddcaccessstub" long-name="DDC Access Stub">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+</component>
+<component name="tvoutconfig" long-name="TV Out Config">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+</component>
+<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+</component>
+<component name="asyreference" long-name="ASY Reference" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+</component>
+<component name="examplecommonisc" long-name="Example Common ISC">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+</component>
+<component name="exampledsy" long-name="Example DSY">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+</component>
+<component name="featuremanagerstub" long-name="Feature Manager Stub">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+</component>
+<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+</component>
+<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+</component>
+<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+</component>
+<component name="ssyreference" long-name="SSY Reference" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+</component>
+<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+</component>
+<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+</component>
+<component name="tvoutbehaviour" long-name="TV Out Behaviour">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+</component>
+<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+</component>
+</collection>
+<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
+<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
+<unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
+</component>
+</collection>
+<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
+<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
+<unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/stubs/sources.csv	Tue Aug 24 14:58:19 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
--- a/symbian4/adaptation/beagleboard/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file
--- a/symbian4/adaptation/beagleboard/sources.csv	Thu Aug 19 18:52:09 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,default,layers.sysdef.xml
--- a/symbian4/adaptation/codecs.aricent/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
-<collection name="utilities" long-name="Aricent Utilities">
-<component name="ariprocessengine" long-name="Aricent Process Engine">
-<unit bldFile="/sf/adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
-</component>
-<component name="aristatemachine" long-name="Aricent State Machine">
-<unit bldFile="/sf/adaptation/codecs.aricent/utilities/aristatemachine/group"/>
-</component>
-</collection>
-<collection name="aaclc_enc" level="plugin">
-<component name="ariaaclcencmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
-</component>
-</collection>
-<collection name="amrnb_dec" level="plugin">
-<component name="ariamrnbdecmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
-</component>
-</collection>
-<collection name="amrnb_enc" level="plugin">
-<component name="ariamrnbencmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
-</component>
-</collection>
-<collection name="amrwb_dec" level="plugin">
-<component name="ariamrwbdecmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
-</component>
-</collection>
-<collection name="h264_dec" level="plugin">
-<component name="arih264dechwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
-</component>
-</collection>
-<collection name="h264_enc" level="plugin">
-<component name="arih264enchwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
-</component>
-</collection>
-<collection name="heaac_dec" level="plugin">
-<component name="ariheaacdecmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
-</component>
-</collection>
-<collection name="mp3_dec" level="plugin">
-<component name="arimp3decmmfcodec">
-<unit bldFile="/sf/adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
-</component>
-</collection>
-<collection name="mp4asp_dec" level="plugin">
-<component name="arimpeg4aspdechwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
-</component>
-</collection>
-<collection name="mp4sp_enc" level="plugin">
-<component name="arimp4spenchwdevice">
-<unit bldFile="/sf/adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file
--- a/symbian4/adaptation/qemu/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<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
--- a/symbian4/adaptation/qemu/sources.csv	Thu Aug 19 18:52:09 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/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
--- a/symbian4/adaptation/stubs/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!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>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-<unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
-</component>
-<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-<unit bldFile="/sf/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-</component>
-</collection>
-<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-<component name="drm_stubs_build" long-name="DRM Stubs Build">
-<unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
-</component>
-</collection>
-<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
-<unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-</collection>
-<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-<unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-</collection>
-<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
-<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-</collection>
-<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
-</component>
-</collection>
-<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-<unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
-<component name="ddcaccessstub" long-name="DDC Access Stub">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
-</component>
-<component name="tvoutconfig" long-name="TV Out Config">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
-</component>
-<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-</component>
-<component name="asyreference" long-name="ASY Reference" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
-</component>
-<component name="examplecommonisc" long-name="Example Common ISC">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
-</component>
-<component name="exampledsy" long-name="Example DSY">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
-</component>
-<component name="featuremanagerstub" long-name="Feature Manager Stub">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-</component>
-<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-</component>
-<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-</component>
-<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-</component>
-<component name="ssyreference" long-name="SSY Reference" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-</component>
-<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-</component>
-<component name="tvoutbehaviour" long-name="TV Out Behaviour">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-</component>
-<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-</component>
-</collection>
-<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-</collection>
-<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-<unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file
--- a/symbian4/adaptation/stubs/sources.csv	Thu Aug 19 18:52:09 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,default,layers.sysdef.xml