--- a/symbian3/os/boardsupport/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/boardsupport/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,119 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-<collection name="emulator" long-name="Emulator" level="bsp">
-<component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-<unit bldFile="/sf/os/boardsupport/emulator/emulatorbsp" mrp="/sf/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-</component>
-</collection>
-<collection name="haitest" long-name="HAI Test Suites" level="test">
-<component name="bspsvs" long-name="BSP Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-</component>
-</collection>
-<collection name="boardsupport_info" long-name="Board Support Info" level="config">
-<component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
+ <collection name="emulator" long-name="Emulator" level="bsp">
+ <component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
+ <unit bldFile="/sf/os/boardsupport/emulator/emulatorbsp" mrp="/sf/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+ </component>
+ </collection>
+ <collection name="haitest" long-name="HAI Test Suites" level="test">
+ <component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
+ <unit mrp="/sf/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
+ </component>
+ </collection>
+ <collection name="boardsupport_info" long-name="Board Support Info" level="config">
+ <component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/boardsupport/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="boardsupport" name="Board Support" levels="bsp test 2 3 config">
+ <collection id="emulator" name="Emulator" level="bsp">
+ <component id="emulatorbsp" name="Emulator BSP" purpose="optional">
+ <unit bldFile="emulator/emulatorbsp" mrp="emulator/emulatorbsp/base_wins.mrp"/>
+ </component>
+ </collection>
+ <collection id="haitest" name="HAI Test Suites" level="test">
+ <component id="bspsvs" name="BSP Verification Suite" introduced="^2" purpose="development">
+ <unit mrp="haitest/bspsvs/group/bspsvs.mrp"/>
+ </component>
+ </collection>
+ <collection id="boardsupport_info" name="Board Support Info" level="config">
+ <component id="boardsupport_metadata" name="Board Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/bt/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/bt/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,182 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
-<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetooth/btstack" mrp="/sf/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
-</component>
-<component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/bt/bluetooth/btcomm" mrp="/sf/os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-</component>
-<component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetooth/btsdp" mrp="/sf/os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-</component>
-<component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetooth/btextnotifiers" mrp="/sf/os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-</component>
-<component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetooth/gavdp/group" mrp="/sf/os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-</component>
-<component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" purpose="development">
-<unit mrp="/sf/os/bt/bluetooth/btexample/test/bluetooth_tests_examples.mrp"/>
-</component>
-<component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetooth/btlogger/group" mrp="/sf/os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-</component>
-<component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-<component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetoothmgmt/btmgr" mrp="/sf/os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-</component>
-<component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
-<unit bldFile="/sf/os/bt/bluetoothmgmt/btconfig" mrp="/sf/os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-</component>
-<component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetoothmgmt/btrom" mrp="/sf/os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-</component>
-<component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/bt/bluetoothmgmt/bluetoothclientlib" mrp="/sf/os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-</component>
-<component name="btcommon" long-name="Bluetooth Build Utilities" purpose="optional">
-<unit mrp="/sf/os/bt/bluetoothmgmt/btcommon/bluetooth_common.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-<component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/bt/bluetoothcommsprofiles/btpan/group" mrp="/sf/os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-</component>
-</collection>
-<collection name="bthci" long-name="Host Controller Interface" level="server">
-<component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/bt/bthci/bthci2/group" mrp="/sf/os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-</component>
-<component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/os/bt/bthci/hciextensioninterface" mrp="/sf/os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-</component>
-<component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/bt/bthci/hci2implementations/group" mrp="/sf/os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-</component>
-</collection>
-<collection name="irda" long-name="IrDA" level="plugin">
-<component name="irdastack" long-name="IrDA Stack" purpose="optional">
-<unit bldFile="/sf/os/bt/irda/irdastack/group" mrp="/sf/os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
-</component>
-</collection>
-<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
-<component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="tb92" purpose="development">
-<unit mrp="/sf/os/bt/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp"/>
-</component>
-</collection>
-<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-<!-- MattD 20091102 - Added manually to stop build failures... Probably an S60 component -->
- <component name="bt_plat" filter="s60" class="api">
- <unit bldFile="/sf/os/bt/bt_plat/group"/>
- </component>
-<component name="bt_metadata" long-name="Bluetooth Metadata" introduced="tb92" purpose="development" class="config PC">
-<unit mrp="/sf/os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="bluetooth" long-name="Bluetooth Core" level="framework">
+ <component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetooth/btstack" mrp="/sf/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
+ </component>
+ <component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/bt/bluetooth/btcomm" mrp="/sf/os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+ </component>
+ <component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetooth/btsdp" mrp="/sf/os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+ </component>
+ <component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetooth/btextnotifiers" mrp="/sf/os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+ </component>
+ <component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetooth/gavdp/group" mrp="/sf/os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+ </component>
+ <component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" filter="test">
+ <unit mrp="/sf/os/bt/bluetooth/btexample/test/bluetooth_tests_examples.mrp" bldFile="/sf/os/bt/bluetooth/btexample/test/group"/>
+ </component>
+ <component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetooth/btlogger/group" mrp="/sf/os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+ </component>
+ <component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
+ <component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetoothmgmt/btmgr" mrp="/sf/os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+ </component>
+ <component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config">
+ <unit bldFile="/sf/os/bt/bluetoothmgmt/btconfig" mrp="/sf/os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+ </component>
+ <component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetoothmgmt/btrom" mrp="/sf/os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+ </component>
+ <component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/bt/bluetoothmgmt/bluetoothclientlib" mrp="/sf/os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+ </component>
+ <component name="btcommon" long-name="Bluetooth Build Utilities" purpose="optional" filter="test">
+ <unit mrp="/sf/os/bt/bluetoothmgmt/btcommon/bluetooth_common.mrp" bldFile="/sf/os/bt/bluetoothmgmt/btcommon"/>
+ </component>
+ </collection>
+ <collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
+ <component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/bt/bluetoothcommsprofiles/btpan/group" mrp="/sf/os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+ </component>
+ </collection>
+ <collection name="bthci" long-name="Host Controller Interface" level="server">
+ <component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/bt/bthci/bthci2/group" mrp="/sf/os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+ </component>
+ <component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+ <unit bldFile="/sf/os/bt/bthci/hciextensioninterface" mrp="/sf/os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+ </component>
+ <component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/bt/bthci/hci2implementations/group" mrp="/sf/os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+ </component>
+ </collection>
+ <collection name="irda" long-name="IrDA" level="plugin">
+ <component name="irdastack" long-name="IrDA Stack" purpose="optional">
+ <unit bldFile="/sf/os/bt/irda/irdastack/group" mrp="/sf/os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
+ </component>
+ </collection>
+ <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
+ <component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="^3" purpose="development" filter="test">
+ <unit mrp="/sf/os/bt/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp" bldFile="/sf/os/bt/bluetoothapitest/bluetoothsvs/group"/>
+ </component>
+ </collection>
+ <collection name="atext" long-name="AT Extensions" level="server">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component name="atext_build" long-name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+ <unit bldFile="/sf/os/bt/atext/group"/>
+ </component>
+ </collection>
+ <collection name="bt_info" long-name="Bluetooth Info" level="app-if">
+ <component name="bt_plat" filter="s60" class="api">
+ <unit bldFile="/sf/os/bt/bt_plat/group"/>
+ </component>
+ <component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
+ <unit mrp="/sf/os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/bt/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="bt" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="bluetooth" name="Bluetooth Core" level="framework">
+ <component id="btstack" name="Bluetooth Stack" introduced="6.0" purpose="optional">
+ <unit bldFile="bluetooth/btstack" mrp="bluetooth/btstack/bluetooth_stack.mrp"/>
+ </component>
+ <component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
+ <unit bldFile="bluetooth/btcomm" mrp="bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+ </component>
+ <component id="btsdp" name="Bluetooth SDP" introduced="6.1" purpose="optional">
+ <unit bldFile="bluetooth/btsdp" mrp="bluetooth/btsdp/bluetooth_sdp.mrp"/>
+ </component>
+ <component id="btextnotifiers" name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+ <unit bldFile="bluetooth/btextnotifiers" mrp="bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+ </component>
+ <component id="gavdp" name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+ <unit bldFile="bluetooth/gavdp/group" mrp="bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+ </component>
+ <component id="btexample" name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" filter="test">
+ <unit mrp="bluetooth/btexample/test/bluetooth_tests_examples.mrp" bldFile="bluetooth/btexample/test/group"/>
+ </component>
+ <component id="btlogger" name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+ <unit bldFile="bluetooth/btlogger/group" mrp="bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+ </component>
+ <component id="btdocs" name="Bluetooth Documentation" purpose="development" class="doc">
+ <unit mrp="bluetooth/btdocs/bluetooth_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection id="bluetoothmgmt" name="Bluetooth Management" level="plugin">
+ <component id="btmgr" name="Bluetooth Manager" introduced="6.0" purpose="optional">
+ <unit bldFile="bluetoothmgmt/btmgr" mrp="bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+ </component>
+ <component id="btconfig" name="Bluetooth Config" purpose="optional" class="config">
+ <unit bldFile="bluetoothmgmt/btconfig" mrp="bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+ </component>
+ <component id="btrom" name="Bluetooth ROM" introduced="9.1" purpose="optional">
+ <unit bldFile="bluetoothmgmt/btrom" mrp="bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+ </component>
+ <component id="bluetoothclientlib" name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+ <unit bldFile="bluetoothmgmt/bluetoothclientlib" mrp="bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+ </component>
+ <component id="btcommon" name="Bluetooth Build Utilities" purpose="optional" filter="test">
+ <unit mrp="bluetoothmgmt/btcommon/bluetooth_common.mrp" bldFile="bluetoothmgmt/btcommon"/>
+ </component>
+ </collection>
+ <collection id="bluetoothcommsprofiles" name="Bluetooth Comms Profiles" level="app-if">
+ <component id="btpan" name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" class="plugin">
+ <unit bldFile="bluetoothcommsprofiles/btpan/group" mrp="bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+ </component>
+ </collection>
+ <collection id="bthci" name="Host Controller Interface" level="server">
+ <component id="bthci2" name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+ <unit bldFile="bthci/bthci2/group" mrp="bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+ </component>
+ <component id="hciextensioninterface" name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+ <unit bldFile="bthci/hciextensioninterface" mrp="bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+ </component>
+ <component id="hci2implementations" name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" class="plugin">
+ <unit bldFile="bthci/hci2implementations/group" mrp="bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+ </component>
+ </collection>
+ <collection id="irda" name="IrDA" level="plugin">
+ <component id="irdastack" name="IrDA Stack" purpose="optional">
+ <unit bldFile="irda/irdastack/group" mrp="irda/irdastack/group/infra-red_irda.mrp"/>
+ </component>
+ </collection>
+ <collection id="bluetoothapitest" name="Bluetooth API Tests" level="app-if">
+ <component id="bluetoothsvs" name="Bluetooth Verification Suite" introduced="^3" purpose="development" filter="test">
+ <unit mrp="bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp" bldFile="bluetoothapitest/bluetoothsvs/group"/>
+ </component>
+ </collection>
+ <collection id="bt_info" name="Bluetooth Info" level="app-if">
+ <component id="bt_plat" filter="s60" class="api">
+ <unit bldFile="bt_plat/group"/>
+ </component>
+ <component id="bt_metadata" name="Bluetooth Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+ <unit mrp="bt_info/bt_metadata/bt_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/buildtools/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/buildtools/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,166 +1,145 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-<collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-<component name="buildsystemtools" long-name="Build System Tools" purpose="development">
-<unit bldFile="/sf/os/buildtools/bldsystemtools/buildsystemtools/group" mrp="/sf/os/buildtools/bldsystemtools/buildsystemtools/group/tools_build.mrp"/>
-</component>
-<component name="gttechviewbaseline" long-name="GT Techview Baseline" purpose="development">
-<unit mrp="/sf/os/buildtools/packaging/additionalutils/gt_techview_baseline.mrp"/>
-</component>
-<component name="commonbldutils" long-name="Common Utils" purpose="development">
-<unit mrp="/sf/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-</component>
-</collection>
-<collection name="packaging" long-name="Packaging" level="ui">
-<component name="additionalutils" long-name="Additional Utils" purpose="development">
-<unit mrp="/sf/os/buildtools/packaging/additionalutils/additional_unknown_cedar.mrp"/>
-</component>
-<component name="dummy" long-name="Dummy" purpose="development">
-<unit bldFile="/sf/os/buildtools/packaging/dummy" mrp="/sf/os/buildtools/packaging/dummy/additional_dummy.mrp"/>
-</component>
-</collection>
-<collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-<component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-<unit mrp="/sf/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-</component>
-<component name="e32tools" long-name="E32 Tools" deprecated="tb91" purpose="development" class="PC">
-<unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-</component>
-<component name="wincredistribution" long-name="WinC Redistribution" purpose="development">
-<unit mrp="/sf/os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp"/>
-</component>
-<component name="additionalredistribution" long-name="Additional Redistribution" purpose="development">
-<unit mrp="/sf/os/buildtools/perltoolsplat_os/redistribution/additional_tools.mrp"/>
-</component>
-<component name="statapi" long-name="STAT API" filter="gt" purpose="development">
-<unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="/sf/os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
-</component>
-<component name="wintunnel" long-name="Wintunnel" purpose="development">
-<unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp"/>
-</component>
-<component name="autotest" long-name="Autotest" purpose="development">
-<unit bldFile="/sf/os/buildtools/toolsandutils/autotest/group" mrp="/sf/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-</component>
-</collection>
-<collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-<component name="e32toolp" long-name="E32 Perl Tools" purpose="development" class="PC">
-<unit bldFile="/sf/os/buildtools/sbsv1_os/e32toolp/group" mrp="/sf/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp"/>
-</component>
-</collection>
-<collection name="imgtools_os" long-name="Image Tools" level="fw">
-<component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="tb91" purpose="development">
-<unit bldFile="/sf/os/buildtools/imgtools_os/romkiteka2/group" mrp="/sf/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-</component>
-</collection>
-<collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-<unit bldFile="/sf/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/sf/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-</component>
-</collection>
-<collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-<component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
+ <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
+ <component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
+ <unit mrp="/sf/os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+ </component>
+ <component name="gttechviewbaseline" long-name="GT Techview Baseline" purpose="development">
+ <unit mrp="/sf/os/buildtools/packaging/additionalutils/gt_techview_baseline.mrp"/>
+ </component>
+ <component name="commonbldutils" long-name="Common Utils" purpose="development">
+ <unit mrp="/sf/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+ </component>
+ </collection>
+ <collection name="packaging" long-name="Packaging" level="ui">
+ <component name="additionalutils" long-name="Additional Utils" purpose="development">
+ <unit mrp="/sf/os/buildtools/packaging/additionalutils/additional_unknown_cedar.mrp"/>
+ </component>
+ <component name="dummy" long-name="Dummy" purpose="development">
+ <unit bldFile="/sf/os/buildtools/packaging/dummy" mrp="/sf/os/buildtools/packaging/dummy/additional_dummy.mrp"/>
+ </component>
+ </collection>
+ <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
+ <component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
+ <unit mrp="/sf/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
+ </component>
+ <component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
+ <unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+ </component>
+ <component name="wincredistribution" long-name="WinC Redistribution" purpose="development" filter="test">
+ <unit mrp="/sf/os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp" bldFile="/sf/os/buildtools/dist_os/redistributionwinceka2"/>
+ </component>
+ <component name="additionalredistribution" long-name="Additional Redistribution" purpose="development" filter="test">
+ <unit mrp="/sf/os/buildtools/perltoolsplat_os/redistribution/additional_tools.mrp" bldFile="/sf/os/buildtools/perltoolsplat_os/redistribution"/>
+ </component>
+ <component name="statapi" long-name="STAT API" filter="gt" purpose="development">
+ <unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="/sf/os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
+ </component>
+ <component name="wintunnel" long-name="Wintunnel" purpose="development" filter="test">
+ <unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="/sf/os/buildtools/toolsandutils/wintunnel/group"/>
+ </component>
+ <component name="autotest" long-name="Autotest" purpose="development">
+ <unit bldFile="/sf/os/buildtools/toolsandutils/autotest/group" mrp="/sf/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+ </component>
+ </collection>
+ <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
+ <component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="test" class="PC">
+ <unit mrp="/sf/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="/sf/os/buildtools/sbsv1_os/e32toolp/group"/>
+ </component>
+ </collection>
+ <collection name="imgtools_os" long-name="Image Tools" level="fw">
+ <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
+ <unit bldFile="/sf/os/buildtools/imgtools_os/romkiteka2/group" mrp="/sf/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+ </component>
+ </collection>
+ <collection name="misccomponents" long-name="Misc Components" level="mw">
+ <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
+ <unit bldFile="/sf/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/sf/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+ </component>
+ </collection>
+ <collection name="buildtools_info" long-name="Build Tools Info" level="ui">
+ <component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/buildtools/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="buildtools" name="Build Tools" levels="bld mw fw ui">
+ <collection id="bldsystemtools" name="Build System Tools" level="bld">
+ <component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
+ <unit mrp="bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+ </component>
+ <component id="gttechviewbaseline" name="GT Techview Baseline" purpose="development">
+ <unit mrp="packaging/additionalutils/gt_techview_baseline.mrp"/>
+ </component>
+ <component id="commonbldutils" name="Common Utils" purpose="development">
+ <unit mrp="bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+ </component>
+ </collection>
+ <collection id="packaging" name="Packaging" level="ui">
+ <component id="additionalutils" name="Additional Utils" purpose="development">
+ <unit mrp="packaging/additionalutils/additional_unknown_cedar.mrp"/>
+ </component>
+ <component id="dummy" name="Dummy" purpose="development">
+ <unit bldFile="packaging/dummy" mrp="packaging/dummy/additional_dummy.mrp"/>
+ </component>
+ </collection>
+ <collection id="toolsandutils" name="Tools and Utils" level="mw">
+ <component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
+ <unit mrp="toolsandutils/productionbldtools/product_tools.mrp"/>
+ </component>
+ <component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
+ <unit bldFile="toolsandutils/e32tools/group" mrp="toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+ </component>
+ <component id="wincredistribution" name="WinC Redistribution" purpose="development" filter="test">
+ <unit mrp="dist_os/redistributionwinceka2/tools_redistribution_winc.mrp" bldFile="dist_os/redistributionwinceka2"/>
+ </component>
+ <component id="additionalredistribution" name="Additional Redistribution" purpose="development" filter="test">
+ <unit mrp="perltoolsplat_os/redistribution/additional_tools.mrp" bldFile="perltoolsplat_os/redistribution"/>
+ </component>
+ <component id="statapi" name="STAT API" filter="gt" purpose="development">
+ <unit bldFile="toolsandutils/statapi/source/statapi/console" mrp="toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
+ </component>
+ <component id="wintunnel" name="Wintunnel" purpose="development" filter="test">
+ <unit mrp="toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="toolsandutils/wintunnel/group"/>
+ </component>
+ <component id="autotest" name="Autotest" purpose="development">
+ <unit bldFile="toolsandutils/autotest/group" mrp="toolsandutils/autotest/group/tools_autotest.mrp"/>
+ </component>
+ </collection>
+ <collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
+ <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="test">
+ <unit mrp="sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="sbsv1_os/e32toolp/group"/>
+ </component>
+ </collection>
+ <collection id="imgtools_os" name="Image Tools" level="fw">
+ <component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
+ <unit bldFile="imgtools_os/romkiteka2/group" mrp="imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+ </component>
+ </collection>
+ <collection id="misccomponents" name="Misc Components" level="mw">
+ <component id="emulatorlauncher" name="Emulator Launcher" filter="gt" purpose="development">
+ <unit bldFile="misccomponents/emulatorlauncher/group" mrp="misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+ </component>
+ </collection>
+ <collection id="buildtools_info" name="Build Tools Info" level="ui">
+ <component id="buildtools_metadata" name="Build Tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/cellularsrv/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/cellularsrv/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,239 +1,221 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-<component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
-</component>
-</collection>
-<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-</component>
-</collection>
-<collection name="fax" long-name="Fax" level="server">
-<component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/fax/faxclientandserver/Group" mrp="/sf/os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
-<collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-<component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/smsprotocols/smsstack/group" mrp="/sf/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-</component>
-</collection>
-<collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-<component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/csdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-</component>
-<component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/psdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-</component>
-<component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-</component>
-<component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-</component>
-<component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-</component>
-<component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-</component>
-<component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-</component>
-<component name="pdplayer" long-name="PDP Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="/sf/os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
-</component>
-<component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserver" long-name="Telephony Server" level="server">
-<component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
-<unit bldFile="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-</component>
-<component name="etelconfig" long-name="ETel Config" purpose="mandatory" class="config">
-<unit mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp"/>
-</component>
-<component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/cellularsrv/telephonyserver/etelmultimode/group" mrp="/sf/os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-</component>
-<component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-</component>
-<component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
-<unit bldFile="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-</component>
-</collection>
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-<component name="common_tsy" long-name="Common TSY" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-</component>
-<component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="tb91" purpose="development" plugin="Y">
-<unit mrp="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp"/>
-</component>
-<component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-</component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
-<component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
-</component>
-<component name="simatktsy" long-name="SIMATK TSY" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
-</component>
-</collection>
-<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-<component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-<unit bldFile="/sf/os/cellularsrv/telephonyutils/dial/group" mrp="/sf/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-</component>
-<component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-</component>
-<component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-<component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-</component>
-<component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-</component>
-<component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-<component name="mocksy" long-name="MockSY" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-</component>
-</collection>
-<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if">
-<component name="datatransferhaitest" long-name="Data Transfer HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/cellularsrv/cellularsrvapitest/datatransferhaitest/group/datatransferhaitest.mrp"/>
-</component>
-<component name="telephonyhaitest" long-name="Telephony HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/cellularsrv/cellularsrvapitest/telephonyhaitest/group/telephonyhaitest.mrp"/>
-</component>
-<component name="telephonydevsoundhaitest" long-name="DevSound Telephony HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="cellularsrv">
-<unit bldFile="/sf/os/cellularsrv/group" mrp=""/>
-</component>
-<component name="sf_common_tsy">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp=""/>
-</component>
-<component name="sf_licenseetsystub">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
+ <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
+ <unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
+ </component>
+ <component name="isc_if" filter="s60" long-name="Inter-System Communication Interface">
+ <unit bldFile="/sf/os/cellularsrv/basebandabstraction/isc_if/group"/>
+ </component>
+ </collection>
+ <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+ <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+ </component>
+ </collection>
+ <collection name="fax" long-name="Fax" level="server">
+ <component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
+ <unit bldFile="/sf/os/cellularsrv/fax/faxclientandserver/Group" mrp="/sf/os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
+ </component>
+ </collection>
+ <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
+ <component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/smsprotocols/smsstack/group" mrp="/sf/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+ </component>
+ </collection>
+ <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
+ <component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/csdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+ </component>
+ <component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/psdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+ </component>
+ <component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+ </component>
+ <component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+ </component>
+ <component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+ </component>
+ <component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+ </component>
+ <component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+ </component>
+ <component name="pdplayer" long-name="PDP Layer" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="/sf/os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+ </component>
+ <component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+ </component>
+ </collection>
+ <collection name="telephonyserver" long-name="Telephony Server" level="server">
+ <component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+ </component>
+ <component name="etelconfig" long-name="ETel Config" purpose="mandatory" filter="test" class="config">
+ <unit mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp" bldFile="/sf/os/cellularsrv/telephonyserver/etelserverandcore/data"/>
+ </component>
+ <component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelmultimode/group" mrp="/sf/os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+ </component>
+ <component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+ </component>
+ <component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+ </component>
+ </collection>
+ <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
+ <component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+ </component>
+ <component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="test" plugin="Y">
+ <unit mrp="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
+ </component>
+ <component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+ </component>
+ <component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
+ </component>
+ <component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+ </component>
+ <component name="simatktsy" long-name="SIMATK TSY" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+ </component>
+ </collection>
+ <collection name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
+ <component name="gennif" filter="s60" long-name="Generic NIF">
+ <unit bldFile="/sf/os/cellularsrv/commonnetworkinterface/gennif/group"/>
+ </component>
+ <component name="gprsumtsagent" filter="s60" long-name="GPRS UMTS Agent">
+ <unit bldFile="/sf/os/cellularsrv/commonnetworkinterface/gprsumtsagent/group"/>
+ </component>
+ </collection>
+ <collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
+ <component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
+ <unit bldFile="/sf/os/cellularsrv/telephonyutils/dial/group" mrp="/sf/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
+ </component>
+ <component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+ </component>
+ <component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+ <unit bldFile="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+ </component>
+ </collection>
+ <collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
+ <component name="cellularsrv_plat" filter="s60" long-name="Cellular Baseband Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/cellularsrv/cellularsrv_plat/group"/>
+ </component>
+ <component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+ </component>
+ <component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+ </component>
+ <component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+ <component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+ </component>
+ </collection>
+ <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if">
+ <component name="datatransferhaitest" long-name="Data Transfer HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/cellularsrv/cellularsrvapitest/datatransferhaitest/group/datatransferhaitest.mrp" bldFile="/sf/os/cellularsrv/cellularsrvapitest/datatransferhaitest/group"/>
+ </component>
+ <component name="telephonyhaitest" long-name="Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/cellularsrv/cellularsrvapitest/telephonyhaitest/group/telephonyhaitest.mrp" bldFile="/sf/os/cellularsrv/cellularsrvapitest/telephonyhaitest/group"/>
+ </component>
+ <component name="telephonydevsoundhaitest" long-name="DevSound Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="/sf/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/cellularsrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="cellularsrv" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
+ <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
+ <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
+ </component>
+ <component id="isc_if" filter="s60" name="Inter-System Communication Interface">
+ <unit bldFile="basebandabstraction/isc_if/group"/>
+ </component>
+ </collection>
+ <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+ <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
+ <unit bldFile="basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+ </component>
+ </collection>
+ <collection id="fax" name="Fax" level="server">
+ <component id="faxclientandserver" name="Fax Client and Server" purpose="optional">
+ <unit bldFile="fax/faxclientandserver/Group" mrp="fax/faxclientandserver/Group/telephony_fax.mrp"/>
+ </component>
+ </collection>
+ <collection id="smsprotocols" name="SMS Protocols" level="framework">
+ <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
+ <unit bldFile="smsprotocols/smsstack/group" mrp="smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+ </component>
+ </collection>
+ <collection id="telephonyprotocols" name="Telephony Protocols" level="framework">
+ <component id="csdagt" name="CSD AGT" introduced="6.1" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/csdagt/group" mrp="telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+ </component>
+ <component id="psdagt" name="PSD AGT" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/psdagt/group" mrp="telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+ </component>
+ <component id="gprsumtsqosprt" name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/gprsumtsqosprt/group" mrp="telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+ </component>
+ <component id="gprsumtsqosinterface" name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/gprsumtsqosinterface/group" mrp="telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+ </component>
+ <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
+ <unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+ </component>
+ <component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+ <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+ </component>
+ <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/qos3gppcpr/group" mrp="telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+ </component>
+ <component id="pdplayer" name="PDP Layer" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/pdplayer/group" mrp="telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+ </component>
+ <component id="rawipnif" name="Raw IP NIF" introduced="8.1" purpose="optional" class="plugin">
+ <unit bldFile="telephonyprotocols/rawipnif/group" mrp="telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+ </component>
+ </collection>
+ <collection id="telephonyserver" name="Telephony Server" level="server">
+ <component id="etelserverandcore" name="ETel Server and Core" purpose="mandatory">
+ <unit bldFile="telephonyserver/etelserverandcore/group" mrp="telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+ </component>
+ <component id="etelconfig" name="ETel Config" purpose="mandatory" class="config" filter="test">
+ <unit mrp="telephonyserver/etelserverandcore/group/telephony_etel-config.mrp" bldFile="telephonyserver/etelserverandcore/data"/>
+ </component>
+ <component id="etelmultimode" name="ETel Multimode" introduced="7.0" purpose="mandatory">
+ <unit bldFile="telephonyserver/etelmultimode/group" mrp="telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+ </component>
+ <component id="etelpacketdata" name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+ <unit bldFile="telephonyserver/etelpacketdata/group" mrp="telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+ </component>
+ <component id="etelsimtoolkit" name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+ <unit bldFile="telephonyserver/etelsimtoolkit/group" mrp="telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+ </component>
+ </collection>
+ <collection id="telephonyserverplugins" name="Telephony Server Plugins" level="plugin">
+ <component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="telephonyserverplugins/common_tsy/group" mrp="telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+ </component>
+ <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="test">
+ <unit mrp="telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="telephonyserverplugins/licenseetsystub/group"/>
+ </component>
+ <component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
+ <unit bldFile="telephonyserverplugins/multimodetsy/group" mrp="telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+ </component>
+ <component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin">
+ <unit bldFile="telephonyserverplugins/simtsy/group" mrp="telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
+ </component>
+ <component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="telephonyserverplugins/ctsydispatchlayer/group" mrp="telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+ </component>
+ <component id="simatktsy" name="SIMATK TSY" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="telephonyserverplugins/simatktsy/group" mrp="telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+ </component>
+ </collection>
+ <collection id="commonnetworkinterface" name="Common Network Interface" level="hw-if">
+ <component id="gennif" filter="s60" name="Generic NIF">
+ <unit bldFile="commonnetworkinterface/gennif/group"/>
+ </component>
+ <component id="gprsumtsagent" filter="s60" name="GPRS UMTS Agent">
+ <unit bldFile="commonnetworkinterface/gprsumtsagent/group"/>
+ </component>
+ </collection>
+ <collection id="telephonyutils" name="Telephony Utilities" level="app-if">
+ <component id="dial" name="Dial" deprecated="9.1" purpose="optional">
+ <unit bldFile="telephonyutils/dial/group" mrp="telephonyutils/dial/group/telephony_dial.mrp"/>
+ </component>
+ <component id="telephonywatchers" name="Telephony Watchers" introduced="6.0" purpose="optional" class="plugin">
+ <unit bldFile="telephonyutils/telephonywatchers/group" mrp="telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+ </component>
+ <component id="etel3rdpartyapi" name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+ <unit bldFile="telephonyutils/etel3rdpartyapi/Group" mrp="telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+ </component>
+ </collection>
+ <collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
+ <component id="cellularsrv_plat" filter="s60" name="Cellular Baseband Services Platform Interfaces" class="api">
+ <unit bldFile="cellularsrv_plat/group"/>
+ </component>
+ <component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
+ <unit mrp="cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+ </component>
+ <component id="telephonydocs" name="Telephony Documentation" purpose="development" class="doc">
+ <unit mrp="cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+ </component>
+ <component id="cellularsrv_metadata" name="Cellular Baseband Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+ <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
+ <unit bldFile="hwpluginsimulation/mocksy/group" mrp="hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+ </component>
+ </collection>
+ <collection id="cellularsrvapitest" name="Telephony API Tests" level="app-if">
+ <component id="datatransferhaitest" name="Data Transfer HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="cellularsrvapitest/datatransferhaitest/group/datatransferhaitest.mrp" bldFile="cellularsrvapitest/datatransferhaitest/group"/>
+ </component>
+ <component id="telephonyhaitest" name="Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="cellularsrvapitest/telephonyhaitest/group/telephonyhaitest.mrp" bldFile="cellularsrvapitest/telephonyhaitest/group"/>
+ </component>
+ <component id="telephonydevsoundhaitest" name="DevSound Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="cellularsrvapitest/telephonydevsoundhaitest/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/commsfw/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/commsfw/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,192 +1,167 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
-<collection name="commsprocess" long-name="Comms Process" level="process">
-<component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-</component>
-<component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config">
-<unit mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp"/>
-</component>
-</collection>
-<collection name="commsconfig" long-name="Comms Config" level="process">
-<component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-</component>
-<component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/commsconfig/commsdatabaseshim/group" mrp="/sf/os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-</component>
-</collection>
-<collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-<component name="esockserver" long-name="ESock Server" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/datacommsserver/esockserver/group" mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
-</component>
-<component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config">
-<unit mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp" version="3"/>
-</component>
-<component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/datacommsserver/networkinterfacemgr/group" mrp="/sf/os/commsfw/datacommsserver/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
-</component>
-<component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/group" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-</component>
-<component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/default" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-</component>
-<component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/commsfw/datacommsserver/networkcontroller/group" mrp="/sf/os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-</component>
-</collection>
-<collection name="serialserver" long-name="Serial Server" level="server">
-<component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/commsfw/serialserver/serialportcsy" mrp="/sf/os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
-</component>
-<component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
-<unit bldFile="/sf/os/commsfw/serialserver/packetloopbackcsy/group" mrp="/sf/os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-</component>
-<component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/serialserver/c32serialserver/group" mrp="/sf/os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-</component>
-<component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
-<unit bldFile="/sf/os/commsfw/serialserver/c32serialserverconfig" mrp="/sf/os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-</component>
-<component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-</component>
-</collection>
-<collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-<component name="commsbufs" long-name="Comms Buffers" introduced="tb92" purpose="mandatory">
-<!-- <unit bldFile="/sf/os\unref\orphan\comgen\comms-infras\commsbufs\group" mrp="/sf/os\unref\orphan\comgen\comms-infras\commsbufs\group\comms-infras_commsbufs.mrp"/> -->
- <unit bldFile="/sf/os/commsfw/commsfwutils/commsbufs/group" mrp="/sf/os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
-</component>
-</collection>
-<collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-<component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
-<unit mrp="/sf/os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-</component>
-<component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-<component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
-<unit bldFile="/sf/os/commsfw/commsfwsupport/commselements/group" mrp="/sf/os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-</component>
-</collection>
-<collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-<component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="tb92" purpose="development">
-<unit mrp="/sf/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-</component>
-</collection>
-<collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
-<component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component>
-<component name="commstools" long-name="Comms Tools" introduced="tb91" purpose="development" class="PC">
-<unit mrp="/sf/os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
+ <collection name="commsprocess" long-name="Comms Process" level="process">
+ <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+ </component>
+ <component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" purpose="mandatory" filter="test" class="config">
+ <unit mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp" bldFile="/sf/os/commsfw/commsprocess/commsrootserverconfig/etc"/>
+ </component>
+ </collection>
+ <collection name="commsconfig" long-name="Comms Config" level="process">
+ <component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+ </component>
+ <component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/commsconfig/commsdatabaseshim/group" mrp="/sf/os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+ </component>
+ </collection>
+ <collection name="datacommsserver" long-name="Data Comms Server" level="framework">
+ <component name="esockserver" long-name="ESock Server" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/datacommsserver/esockserver/group" mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="3"/>
+ </component>
+ <component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" purpose="mandatory" filter="test" class="config">
+ <unit mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp" bldFile="/sf/os/commsfw/datacommsserver/esockserver/etc" version="3"/>
+ </component>
+ <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional">
+ <unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/group" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+ </component>
+ <component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+ <unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/default" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+ </component>
+ <component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/commsfw/datacommsserver/networkcontroller/group" mrp="/sf/os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+ </component>
+ </collection>
+ <collection name="serialserver" long-name="Serial Server" level="server">
+ <component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/commsfw/serialserver/serialportcsy" mrp="/sf/os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+ </component>
+ <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development">
+ <unit bldFile="/sf/os/commsfw/serialserver/packetloopbackcsy/group" mrp="/sf/os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+ </component>
+ <component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/serialserver/c32serialserver/group" mrp="/sf/os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+ </component>
+ <component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+ <unit bldFile="/sf/os/commsfw/serialserver/c32serialserverconfig" mrp="/sf/os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+ </component>
+ <component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
+ <component name="commsbufs" long-name="Comms Buffers" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/commsfwutils/commsbufs/group" mrp="/sf/os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+ </component>
+ </collection>
+ <collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
+ <component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+ <unit mrp="/sf/os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+ </component>
+ <component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
+ <component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory">
+ <unit bldFile="/sf/os/commsfw/commsfwsupport/commselements/group" mrp="/sf/os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+ </component>
+ </collection>
+ <collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
+ <component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+ <unit mrp="/sf/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+ </component>
+ </collection>
+ <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
+ <component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
+ <unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+ </component>
+ <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
+ <unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+ </component>
+ <component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
+ <unit bldFile="/sf/os/commsfw/commsfwtools/commstools/group" mrp="/sf/os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/commsfw/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="commsfw" name="Communications Framework" levels="server support framework process app-if">
+ <collection id="commsprocess" name="Comms Process" level="process">
+ <component id="commsrootserver" name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="commsprocess/commsrootserverconfig/group" mrp="commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+ </component>
+ <component id="commsrootserverconfig" name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config" filter="test">
+ <unit mrp="commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp" bldFile="commsprocess/commsrootserverconfig/etc"/>
+ </component>
+ </collection>
+ <collection id="commsconfig" name="Comms Config" level="process">
+ <component id="commsdatabase" name="Comms Database" purpose="mandatory">
+ <unit bldFile="commsfwtools/preparedefaultcommsdatabase/group" mrp="commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+ </component>
+ <component id="commsdatabaseshim" name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+ <unit bldFile="commsconfig/commsdatabaseshim/group" mrp="commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+ </component>
+ </collection>
+ <collection id="datacommsserver" name="Data Comms Server" level="framework">
+ <component id="esockserver" name="ESock Server" purpose="mandatory">
+ <unit version="3" bldFile="datacommsserver/esockserver/group" mrp="datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
+ </component>
+ <component id="esockserverconfig" name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config" filter="test">
+ <unit version="3" mrp="datacommsserver/esockserver/group/comms-infras_esock-config.mrp" bldFile="datacommsserver/esockserver/etc"/>
+ </component>
+ <component id="networkingdialogapi" name="Networking Dialog API" introduced="6.1" purpose="optional">
+ <unit bldFile="datacommsserver/networkingdialogapi/group" mrp="datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+ </component>
+ <component id="networkingdialogstub" name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+ <unit bldFile="datacommsserver/networkingdialogapi/default" mrp="datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+ </component>
+ <component id="networkcontroller" name="Network Controller" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="datacommsserver/networkcontroller/group" mrp="datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+ </component>
+ </collection>
+ <collection id="serialserver" name="Serial Server" level="server">
+ <component id="serialportcsy" name="Serial Port CSY" introduced="ER5" purpose="optional" class="plugin">
+ <unit bldFile="serialserver/serialportcsy" mrp="serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+ </component>
+ <component id="packetloopbackcsy" name="Packet Loopback CSY" introduced="8.1" purpose="development">
+ <unit bldFile="serialserver/packetloopbackcsy/group" mrp="serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+ </component>
+ <component id="c32serialserver" name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+ <unit bldFile="serialserver/c32serialserver/group" mrp="serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+ </component>
+ <component id="c32serialserverconfig" name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+ <unit bldFile="serialserver/c32serialserverconfig" mrp="serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+ </component>
+ <component id="c32serialserverdocs" name="C32 Serial Server Documentation" purpose="development" class="doc">
+ <unit mrp="serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection id="commsfwutils" name="Comms Framework Utilities" level="framework">
+ <component id="commsbufs" name="Comms Buffers" introduced="^3" purpose="mandatory">
+ <unit bldFile="commsfwutils/commsbufs/group" mrp="commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+ </component>
+ </collection>
+ <collection id="commsfw_info" name="Comms Framework Info" level="app-if">
+ <component id="commsinfrastructuredocs" name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+ <unit mrp="commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+ </component>
+ <component id="commsfw_metadata" name="Communications Framework Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection id="commsfwsupport" name="Comms Framework Support" level="support">
+ <component id="commselements" name="Comms Elements" introduced="8.0" purpose="mandatory">
+ <unit bldFile="commsfwsupport/commselements/group" mrp="commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+ </component>
+ </collection>
+ <collection id="commsinfrastructureapitest" name="Comms-Infras API Tests" level="app-if">
+ <component id="commsinfrastructuresvs" name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+ <unit mrp="commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+ </component>
+ </collection>
+ <collection id="commsfwtools" name="Comms Framework Tools" level="app-if">
+ <component id="preparedefaultcommsdatabase" name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config" target="desktop">
+ <unit bldFile="commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+ </component>
+ <component id="installdefaultcommsdatabase" name="Install Default Comms Database" purpose="mandatory" target="desktop">
+ <unit bldFile="commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+ </component>
+ <component id="commstools" name="Comms Tools" introduced="^3" purpose="development" target="desktop">
+ <unit bldFile="commsfwtools/commstools/group" mrp="commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/deviceplatformrelease/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,136 +1,186 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
-<collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-<component name="cedarutils" long-name="Cedar Utils" purpose="development">
-<unit mrp="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-</component>
-<component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
-<unit mrp="/sf/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-</component>
-</collection>
-<collection name="foundation_system" long-name="Foundation System" level="top">
-<component name="systemdocs" long-name="System Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/deviceplatformrelease/foundation_system/systemdocs/group/system.mrp"/>
-</component>
-<component name="system_model" long-name="System Model" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-</component>
-</collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="S60Extras">
-<unit bldFile="/sf/os/deviceplatformrelease/S60Extras/group" mrp=""/>
-</component>
-<component name="S60LocFiles">
-<unit bldFile="/sf/os/deviceplatformrelease/S60LocFiles/group" mrp=""/>
-</component>
-<component name="version">
-<unit bldFile="/sf/os/deviceplatformrelease/Version/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
+ <collection name="s60extras" long-name="S60 Extras" level="mid">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/s60extras/group"/>
+ </component>
+ </collection>
+ <collection name="locfiles" long-name="Locale Files" level="mid">
+ <component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
+ <!-- need to move component down a directory -->
+ <unit bldFile="/sf/os/deviceplatformrelease/s60locfiles/group"/>
+ </component>
+ <component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set1"/>
+ </component>
+ <component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set2"/>
+ </component>
+ <component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set3"/>
+ </component>
+ <component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set4"/>
+ </component>
+ <component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set5"/>
+ </component>
+ <component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set6"/>
+ </component>
+ <!-- is the a problem with SF builds with the following? -->
+ <component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set7"/>
+ </component>
+ <component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set8"/>
+ </component>
+ <component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set9"/>
+ </component>
+ <component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set10"/>
+ </component>
+ <component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set11"/>
+ </component>
+ <component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set12"/>
+ </component>
+ <component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set13"/>
+ </component>
+ <component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set14"/>
+ </component>
+ <component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set15"/>
+ </component>
+ <component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set16"/>
+ </component>
+ </collection>
+ <collection name="version" long-name="Version" level="top">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
+ <unit bldFile="/sf/os/deviceplatformrelease/version/group"/>
+ </component>
+ </collection>
+ <collection name="helps_loc2" long-name="Helps Locale 2" level="top">
+ <!-- collection is really a component. Need to move down a directory -->
+ <component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
+ <unit bldFile="/sf/os/deviceplatformrelease/helps_loc2/group"/>
+ </component>
+ </collection>
+ <collection name="sf_config" long-name="SF Config" level="mid">
+ <component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
+ </collection>
+ <!-- should be located locally in buildplatforms/group
+ <collection id="s60bld" name="S60 Build">
+ <component id="buildplatforms" filter="s60" name="Build Platforms">
+ <unit bldFile="/tools/buildplatforms/group"/>
+ </component>
+ </collection>-->
+ <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
+ <component name="cedarutils" long-name="Cedar Utils" purpose="development">
+ <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+ </component>
+ <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+ <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+ </component>
+ <component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
+ <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
+ </component>
+ </collection>
+ <collection name="foundation_system" long-name="Foundation System" level="top">
+ <component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+ </component>
+ </collection>
+ <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
+ <component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="deviceplatformrelease" name="Device Platform Release" levels="bld mid top">
+ <collection id="s60extras" name="S60 Extras" level="mid">
+ <component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
+ <unit bldFile="s60extras/group"/>
+ </component>
+ </collection>
+ <collection id="s60locfiles" name="S60 Locale Files" level="mid">
+ <component id="s60locfiles_build" filter="s60" name="S60 Locale Files Build" class="config" purpose="development">
+ <unit bldFile="s60locfiles/group"/>
+ </component>
+ </collection>
+ <collection id="version" name="Version" level="top">
+ <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
+ <unit bldFile="version/group"/>
+ </component>
+ </collection>
+ <collection id="sf_config" name="SF Config" level="mid">
+ <component id="config" filter="s60" name="Config" class="config" purpose="development">
+ <!-- there should only be one unit. Can any of these be uncommented? -->
+ <!-- <unit bldFile="sf_config/config/apac/group"/> -->
+ <!-- <unit bldFile="sf_config/config/group"/> -->
+ <!-- <unit bldFile="sf_config/config/japan/group"/> -->
+ <!-- <unit bldFile="sf_config/config/western/group"/> -->
+ </component>
+ </collection>
+ <collection id="s60bld" name="S60 Build">
+ <component id="buildplatforms" filter="s60" name="Build Platforms">
+ <!-- should be located locally in buildplatforms/group -->
+ <unit bldFile="/tools/buildplatforms/group"/>
+ </component>
+ </collection>
+ <collection id="symbianosbld" name="Symbian OS Build" level="bld">
+ <component id="cedarutils" name="Cedar Utils" purpose="development">
+ <unit mrp="symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+ </component>
+ <component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+ <unit mrp="symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+ </component>
+ <component id="foundation_s60_packages" name="Foundation S60 Packages" class="config" introduced="^3" purpose="development" target="desktop">
+ <unit mrp="symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
+ </component>
+ </collection>
+ <collection id="foundation_system" name="Foundation System" level="top">
+ <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="foundation_system/system_model/system_model.mrp"/>
+ </component>
+ </collection>
+ <collection id="deviceplatformrelease_info" name="Device Platform Release Info" level="top">
+ <component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/devicesrv/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/devicesrv/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,171 +1,285 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="accessoryservices" long-name="Accessory Services" level="framework">
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-</component>
-</collection>
-<!-- MattD 20091030 - hacked in from package definition. Presume these should be in the GT model... -->
- <collection name="commonservices" long-name="Common Services" level="app-if">
- <component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
- <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group" mrp="/sf/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
- </component>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="accessoryservices" long-name="Accessory Services" level="framework">
+ <component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/group"/>
+ </component>
+ <component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+ </component>
+ <component name="accessoryserver" filter="s60" long-name="Accessory Server">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/group"/>
+ </component>
+ <component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/pluggeddisplay/group"/>
+ </component>
+ <component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+ </component>
+ <component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/group"/>
+ </component>
+ <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+ </component>
+ <component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
+ <unit bldFile="/sf/os/devicesrv/accessoryservices/gid_pc_tool/group"/>
+ </component>
+ </collection>
+ <collection name="commonservices" long-name="Common Services" level="app-if">
+ <component name="commonengine" filter="s60" long-name="Common Engine">
+ <unit bldFile="/sf/os/devicesrv/commonservices/commonengine/group"/>
+ </component>
+ <component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
+ <unit bldFile="/sf/os/devicesrv/commonservices/commonengineresources/group"/>
+ </component>
+ <component name="platformenv" filter="s60" long-name="Platform Environment">
+ <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/group"/>
+ </component>
+ <component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
+ <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group" mrp="/sf/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+ </component>
<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
- <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group" mrp="/sf/os/devicesrv/commonservices\activitymanager\group\activitymanager.mrp"/>
- </component>
- </collection>
-<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-</component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="tb92" purpose="optional" class="config">
-<unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-</component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-</component>
-</collection>
-<collection name="sysstatemgmt" long-name="System State Management" level="server">
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-</component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-</component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-</component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-</component>
-</collection>
-<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-</component>
-</collection>
-<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-</component>
-</collection>
-<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
-<component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/devicesrv/devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp"/>
-</component>
-<component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/devicesrv/devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp"/>
-</component>
-</collection>
-<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="devicesrv">
-<unit bldFile="/sf/os/devicesrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+ <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group" mrp="/sf/os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
+ </component>
+ </collection>
+ <collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
+ <component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/dosservices/commondsy/group"/>
+ </component>
+ <component name="dosserver" filter="s60" long-name="Domestic OS Server">
+ <unit bldFile="/sf/os/devicesrv/dosservices/dosserver/group"/>
+ </component>
+ </collection>
+ <collection name="sensorservices" long-name="Sensor Services" level="framework">
+ <component name="sensorserver" filter="s60" long-name="Sensor Server">
+ <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/group"/>
+ </component>
+ <component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sensorservices/orientationssy/group"/>
+ </component>
+ <component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+ </component>
+ <component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
+ <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/group"/>
+ </component>
+ </collection>
+ <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
+ <component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+ </component>
+ <component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+ </component>
+ <component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+ </component>
+ <component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+ </component>
+ <component name="hapticsserver" filter="s60" long-name="Haptics Server">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+ </component>
+ <component name="hapticsclient" filter="s60" long-name="Haptics Client">
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+ </component>
+ <component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
+ <!-- move these exports into the appropriate above components and delete this component-->
+ <unit bldFile="/sf/os/devicesrv/hwrmhaptics/group"/>
+ </component>
+ </collection>
+ <collection name="mediator" long-name="Mediator" level="app-if">
+ <!--collection is really a component. Move it down a directory -->
+ <component name="mediator_build" filter="s60" long-name="Mediator Build">
+ <unit bldFile="/sf/os/devicesrv/mediator/group"/>
+ </component>
+ </collection>
+ <collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
+ <component name="psmserver" filter="s60" long-name="PSM Server">
+ <unit bldFile="/sf/os/devicesrv/psmservices/psmserver/group"/>
+ </component>
+ </collection>
+ <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
+ <component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+ </component>
+ <component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
+ <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+ may need to -->
+ <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+ </component>
+ <component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibractrl/group"/>
+ </component>
+ <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+ </component>
+ <component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+ </component>
+ <component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
+ <!-- Move exports to a self-contained component.
+ This needs to be kept around until configuration is in place -->
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
+ </component>
+ <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+ <unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+ </component>
+ </collection>
+ <collection name="sysstatemgmt" long-name="System State Management" level="server">
+ <component name="starter" filter="s60" long-name="Starter">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/group"/>
+ <!-- are these test bld.infs needed for the build? -->
+ <!-- <unit bldFile="sysstatemgmt/starter/strtsecnote/group"/> -->
+ <!-- <unit bldFile="sysstatemgmt/starter/strtsecobs/group"/> -->
+ </component>
+ <component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
+ </component>
+ <component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
+ </component>
+ <component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
+ </component>
+ <component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
+ </component>
+ <component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
+ </component>
+ <component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/syslangutil/group"/>
+ </component>
+ <component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/sysrestart/group"/>
+ </component>
+ <component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
+ </component>
+ <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+ </component>
+ <component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+ </component>
+ <component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+ </component>
+ <component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+ </component>
+ </collection>
+ <collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
+ <component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+ </component>
+ </collection>
+ <collection name="systemhealthmanagement" long-name="System Health Management" level="server">
+ <component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+ </component>
+ </collection>
+ <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
+ <component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/devicesrv/devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp" bldFile="/sf/os/devicesrv/devicesrvapitest/accessorieshaitest/group"/>
+ </component>
+ <component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/devicesrv/devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="/sf/os/devicesrv/devicesrvapitest/hwrmhaitest/group"/>
+ </component>
+ </collection>
+ <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
+ <component name="devicesrv_plat" filter="s60" long-name="Device Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/devicesrv/devicesrv_plat/group"/>
+ </component>
+ <component name="devicesrv_pub" filter="s60" long-name="Device Services Public Interfaces" class="api">
+ <unit bldFile="/sf/os/devicesrv/devicesrv_pub/group"/>
+ <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group" filter="bldmefirst"/>
+ <!-- separate to another component? -->
+ </component>
+ <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/devicesrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="devicesrv" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="accessoryservices" name="Accessory Services" level="framework">
+ <component id="accessorymonitor" filter="s60" name="Accessory Monitor">
+ <unit bldFile="accessoryservices/accessorymonitor/group"/>
+ <!-- are these test bld.infs needed for the build? -->
+ <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/tests/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/accmontesttimer/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/stubs/asystub/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessorymonitor/tsrc/public/basic/stubs/group"/> -->
+ </component>
+ <component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
+ <unit bldFile="accessoryservices/accessoryremotecontrol/group"/>
+ <!-- are these test bld.infs needed for the build? -->
+ <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dosservercontrol/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfcore/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/stub/audio/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/stub/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/stub/phone/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryremotecontrol/tsrc/stub/remcon/group"/> -->
+ </component>
+ <component id="accessoryserver" filter="s60" name="Accessory Server">
+ <unit bldFile="accessoryservices/accessoryserver/group"/>
+ <!-- are these test bld.infs needed for the build? -->
+ <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/dsytesttool/dosservercontrol/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfcore/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/dsytesttool/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/accessorytestcontrol/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/stubs/asystub/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/stubs/btasystub/group"/> -->
+ <!-- <unit bldFile="accessoryservices/accessoryserver/tsrc/public/basic/stubs/group"/> -->
+ </component>
+ <component id="headsetstatusapi" filter="s60" name="Headset Status API">
+ <unit bldFile="accessoryservices/headsetstatusapi/group"/>
+ <!-- is this test bld.inf needed for the build? -->
+ <!-- <unit bldFile="accessoryservices/headsetstatusapi/tsrc/public/basic/group"/> -->
+ </component>
+ <component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
+ <unit bldFile="accessoryservices/tspclientmapper/group"/>
+ <!-- is this test bld.inf needed for the build? -->
+ <!-- <unit bldFile="accessoryservices/tspclientmapper/tsrc/public/basic/group"/> -->
+ </component>
+ <component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
+ <unit bldFile="accessoryservices/remotecontrolfw/group" mrp="accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+ </component>
+ <component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
+ <unit bldFile="accessoryservices/gid_pc_tool/group"/>
+ </component>
+ </collection>
+ <collection id="commonservices" name="Common Services" level="app-if">
+ <component id="commonengine" filter="s60" name="Common Engine">
+ <unit bldFile="commonservices/commonengine/group"/>
+ <!-- is this test bld.inf needed for the build? -->
+ <!-- <unit bldFile="commonservices/commonengine/tsrc/public/basic/group"/> -->
+ </component>
+ <component id="commonengineresources" filter="s60" name="Common Engine Resources" class="config">
+ <unit bldFile="commonservices/commonengineresources/group"/>
+ </component>
+ <component id="platformenv" filter="s60" name="Platform Environment">
+ <unit bldFile="commonservices/platformenv/group"/>
+ <!-- <unit bldFile="commonservices/platformenv/disknotifyhandler/group"/> -->
+ <!-- are these bld.infs needed? Can they be included from bld.inf?-->
+ <!-- <unit bldFile="commonservices/platformenv/platformver/group"/> -->
+ <!-- <unit bldFile="commonservices/platformenv/sysversioninfo/group"/> -->
+ <!-- is this test bld.inf needed for the build? -->
+ <!-- <unit bldFile="commonservices/platformenv/tsrc/public/basic/group"/> -->
+ </component>
+ <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
+ <unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
+ </component>
+ <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
+ <unit bldFile="commonservices/activitymanager/group" mrp="commonservices/activitymanager/group/activitymanager.mrp"/>
+ </component>
+ </collection>
+ <collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
+ <component id="dosserver" filter="s60" name="Domestic OS Server">
+ <unit bldFile="dosservices/dosserver/group"/>
+ </component>
+ <component id="commondsy" filter="s60" name="Common DSY" class="plugin">
+ <unit bldFile="dosservices/commondsy/group"/>
+ </component>
+ <component id="dosservices_test" filter="s60" purpose="development" name="DOS Services Test">
+ <!-- is this component needed? If so, can these be #included from a single master test bld.inf?-->
+ <!-- <unit bldFile="dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
+ <!-- <unit bldFile="dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
+ <!-- <unit bldFile="dosservices/tsrc/public/basic/group"/> -->
+ <!-- <unit bldFile="dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
+ <!-- <unit bldFile="dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
+ <!-- <unit bldFile="dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
+ <!-- <unit bldFile="dosservices/tsrc/dsytesttool/group"/> -->
+ </component>
+ </collection>
+ <collection id="resourcemgmt" name="Resource Management" level="hw-if">
+ <component id="serverexe" filter="s60" name="Hardware Resource Manager Server">
+ <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
+ <!-- <unit bldFile="resourcemgmt/serverexe/group"/> -->
+ </component>
+ <component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
+ <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component. Should this be purpose="development" -->
+ <!-- <unit bldFile="resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
+ </component>
+ <component id="clientdll" filter="s60" name="HWRM Client">
+ <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
+ <!-- <unit bldFile="resourcemgmt/clientdll/group"/> -->
+ </component>
+ <component id="commondll" filter="s60" name="HWRM Common">
+ <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
+ <!-- <unit bldFile="resourcemgmt/commondll/group"/> -->
+ </component>
+ <component id="vibraclientdll" filter="s60" name="Vibra Client">
+ <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
+ <!-- <unit bldFile="resourcemgmt/vibraclientdll/group"/> -->
+ </component>
+ <component id="extendedlightclientdll" filter="s60" name="Extended Light Client">
+ <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
+ <!-- <unit bldFile="resourcemgmt/extendedlightclientdll/group"/> -->
+ </component>
+ <component id="lightclientdll" filter="s60" name="Light Client">
+ <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component -->
+ <!-- <unit bldFile="resourcemgmt/lightclientdll/group"/> -->
+ </component>
+ <component id="fmtxclientdll" filter="s60" name="FM Transmitter Client">
+ <!-- this needs to be resolved with the equivalent in the fmtransmittercontrol component -->
+ <!-- <unit bldFile="resourcemgmt/fmtxclientdll/group"/> -->
+ </component>
+ <component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
+ <!-- this needs to be resolved with the equivalent in the hwresourcesmgr component. Should this be purpose="development" -->
+ <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+ <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/tsrc/hwrmtargetmodifierplugintest/group"/> -->
+ </component>
+ <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
+ <unit bldFile="resourcemgmt/vibractrl/group"/>
+ </component>
+ <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
+ <unit bldFile="resourcemgmt/hwresourcesmgr/group" mrp="resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+ </component>
+ <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+ <unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+ </component>
+ <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
+ <!-- need to reconcile this with the above components -->
+ <unit bldFile="resourcemgmt/group"/>
+ </component>
+ <component id="resourcemgmt_test" filter="s60" purpose="development" name="Resource Management Test">
+ <!-- is this component needed?-->
+ <!-- <unit bldFile="resourcemgmt/tsrc/public/basic/group"/> -->
+ </component>
+ <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+ <unit bldFile="resourcemgmt/powerandmemorynotificationservice/group" mrp="resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+ </component>
+ </collection>
+ <collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
+ <component id="hapticseffectdatagetterfw" filter="s60" name="Haptics Effect Data Getter Framework">
+ <unit bldFile="hwrmhaptics/hapticseffectdatagetterfw/group"/>
+ </component>
+ <component id="hapticspluginservice" filter="s60" name="Haptics Plugin Service">
+ <unit bldFile="hwrmhaptics/hapticspluginservice/group"/>
+ </component>
+ <component id="hapticspacketizer" filter="s60" name="Haptics Packetizer">
+ <unit bldFile="hwrmhaptics/hapticspacketizer/group"/>
+ </component>
+ <component id="hapticspluginmanager" filter="s60" name="Haptics Plugin Manager">
+ <unit bldFile="hwrmhaptics/hapticspluginmanager/group"/>
+ </component>
+ <component id="hapticsserver" filter="s60" name="Haptics Server">
+ <unit bldFile="hwrmhaptics/hapticsserver/group"/>
+ </component>
+ <component id="hapticsclient" filter="s60" name="Haptics Client">
+ <unit bldFile="hwrmhaptics/hapticsclient/group"/>
+ </component>
+ <component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
+ <!-- can these exports be put in the appropriate above components? -->
+ <unit bldFile="hwrmhaptics/group"/>
+ </component>
+ </collection>
+ <collection id="mediator" name="Mediator" level="app-if">
+ <component id="mediator_build" filter="s60" name="Mediator Build">
+ <unit bldFile="mediator/group"/>
+ </component>
+ <component id="mediator_test" filter="s60" purpose="development" name="Mediator Test">
+ <!-- need to have a single unit in this component. Either #include one bld.inf from the other or remove the component -->
+ <!-- <unit bldFile="mediator/tsrc/public/basic/group"/> -->
+ <!-- <unit bldFile="mediator/tsrc/public/basic/stub/group"/> -->
+ </component>
+ </collection>
+ <collection id="psmservices" name="Power Save Mode Services" level="app-if">
+ <component id="psmserver" filter="s60" name="PSM Server">
+ <unit bldFile="psmservices/psmserver/group"/>
+ <!-- is this test bld.inf needed for the build? -->
+ <!-- <unit bldFile="psmservices/psmserver/tsrc/public/basic/group"/> -->
+ </component>
+ </collection>
+ <collection id="sensorservices" name="Sensor Services" level="framework">
+ <component id="sensorserver" filter="s60" name="Sensor Server">
+ <unit bldFile="sensorservices/sensorserver/group"/>
+ <!-- are these test bld.infs needed for the build? -->
+ <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/group"/> -->
+ <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/condevalstub/group"/> -->
+ <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/group"/> -->
+ <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/sensrvcondevalplugin/group"/> -->
+ <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/ssystub/group"/> -->
+ <!-- <unit bldFile="sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/stubprocess/group"/> -->
+ </component>
+ <component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
+ <unit bldFile="sensorservices/orientationssy/group"/>
+ </component>
+ <component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
+ <unit bldFile="sensorservices/tiltcompensationssy/group"/>
+ </component>
+ <component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
+ <unit bldFile="sensorservices/sensordatacompensator/group"/>
+ <!-- are these test bld.infs needed for the build? -->
+ <!-- <unit bldFile="sensorservices/sensordatacompensator/tsrc/sensordatacompensatorpluginstub/group"/> -->
+ <!-- <unit bldFile="sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group"/> -->
+ </component>
+ </collection>
+ <collection id="sysstatemgmt" name="System State Management" level="server">
+ <component id="starter" filter="s60" name="Starter">
+ <unit bldFile="sysstatemgmt/starter/group"/>
+ <!-- are these test bld.infs needed for the build? -->
+ <!-- <unit bldFile="sysstatemgmt/starter/strtsecnote/group"/> -->
+ <!-- <unit bldFile="sysstatemgmt/starter/strtsecobs/group"/> -->
+ </component>
+ <component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+ <unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+ </component>
+ <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+ </component>
+ <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="sysstatemgmt/systemstateplugins/group" mrp="sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+ </component>
+ <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="sysstatemgmt/systemstatereferenceplugins/group" mrp="sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+ </component>
+ <component id="sysstatemgmt_test" filter="s60" purpose="development" name="System State Management Test">
+ <!-- <unit bldFile="sysstatemgmt/tsrc/public/basic/group"/> -->
+ </component>
+ </collection>
+ <collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
+ <component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
+ <unit bldFile="resourceinterfaces/fmtransmittercontrol/group" mrp="resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+ </component>
+ </collection>
+ <collection id="systemhealthmanagement" name="System Health Management" level="server">
+ <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
+ <unit bldFile="systemhealthmanagement/systemhealthmgr/group" mrp="systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+ </component>
+ </collection>
+ <collection id="devicesrvapitest" name="Devices Services API Tests" level="app-if">
+ <component id="accessorieshaitest" name="Accessories HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp" bldFile="devicesrvapitest/accessorieshaitest/group"/>
+ </component>
+ <component id="hwrmhaitest" name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="devicesrvapitest/hwrmhaitest/group"/>
+ </component>
+ </collection>
+ <collection id="devicesrv_info" name="Device Services Info" level="app-if">
+ <component id="devicesrv_pub" filter="s60" name="Device Services Public Interfaces" class="api">
+ <unit bldFile="devicesrv_pub/group"/>
+ <!-- <unit bldFile="devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
+ <!-- <unit bldFile="devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
+ </component>
+ <component id="devicesrv_plat" filter="s60" name="Device Services Platform Interfaces" class="api">
+ <unit bldFile="devicesrv_plat/group"/>
+ <!-- <unit bldFile="devicesrv_plat/activity_manager_api/tsrc/group"/> -->
+ </component>
+ <component id="devicesrv_metadata" name="Device Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/graphics/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/graphics/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,231 +1,239 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-<component name="graphicsresource" long-name="Graphics Resource" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresource/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
-</component>
-<component name="graphicsresourceadaptation" long-name="Graphics Resource Adaptation" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
-</component>
-</collection>
-<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
-<component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/sf/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
-</component>
-</collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-<component name="displayldd" long-name="Display Drivers" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
-</component>
-<component name="surfacemgr" long-name="Surface Manager" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/sf/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
-</component>
-</collection>
-<collection name="graphicstest" long-name="Graphics Test" level="app-if">
-<component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development">
-<unit mrp="/sf/os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
-</component>
-<component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
-<unit bldFile="/sf/os/graphics/graphicstest/uibench/group" mrp="/sf/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-</component>
-</collection>
-<collection name="graphics_info" long-name="Graphics Info" level="app-if">
-<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-</component>
-<component name="graphics_metadata" long-name="Graphics Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-</component>
-</collection>
-<collection name="windowing" long-name="Windowing" level="app-if">
-<component name="n:windowserver" long-name="Window Server" purpose="mandatory">
-<!-- intentionally not for the foundation despite being a mandatory component -->
-<unit bldFile="/sf/os/graphics/windowing/windowserver/group" mrp="/sf/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-</component>
-</collection>
-<collection name="printingservices" long-name="Printing Services" level="app-if">
-<component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
-<unit bldFile="/sf/os/graphics/printingservices/printerdriversupport/group" mrp="/sf/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-</component>
-<component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/graphics/printingservices/printerdrivers/group" mrp="/sf/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-</component>
-</collection>
-<collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-<component name="fontandbitmapserver" long-name="Font and Bitmap Server" purpose="mandatory">
-<unit bldFile="/sf/os/graphics/fbs/fontandbitmapserver/group" mrp="/sf/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
-</component>
-</collection>
-<collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
-<component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/graphics/opengles/openglesinterface/group" mrp="/sf/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
-</component>
-</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-<component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/graphics/openvg/openvginterface/group" mrp="/sf/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
-</component>
-</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/graphics/egl/eglinterface/group" mrp="/sf/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
-</component>
-</collection>
-<collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-<component name="gdi" long-name="GDI" purpose="mandatory">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-</component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-</component>
-<component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-</component>
-<component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/sf/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-</component>
-<component name="directgdi" long-name="DirectGDI" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-</component>
-<component name="directgdiinterface" long-name="DirectGDI Interface" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
-</component>
-<component name="directgdiadaptation" long-name="DirectGDI Adaptation" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
-</component>
-</collection>
-<collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
-<unit bldFile="/sf/os/graphics/graphicstools/gdi_tools/group" mrp="/sf/os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-</component>
-</collection>
-<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if">
-<component name="graphicssvs" long-name="Graphics Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
-</component>
-<component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/graphics/graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="graphics">
-<unit bldFile="/sf/os/graphics/group" mrp=""/>
-</component>
-<component name="graphics_plat">
-<unit bldFile="/sf/os/graphics/group/../graphics_plat/group" mrp=""/>
-</component>
-<component name="graphics_m3g_api">
-<unit bldFile="/sf/os/graphics/group/../graphics_plat/m3g_core_api/group" mrp=""/>
-</component>
-<component name="graphics_m3g">
-<unit bldFile="/sf/os/graphics/group/../m3g/m3gcore11/group" mrp=""/>
-</component>
-<component name="graphics_acceleration_vgi">
-<unit bldFile="/sf/os/graphics/group/../graphicsaccelaration/vgi/group" mrp=""/>
-</component>
-<component name="sf_openvg11">
-<unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+ <collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+ <component name="3d_opengl_es_1_1" filter="s60" long-name="3D OpenGL ES 1.1" introduced="^3">
+ <unit bldFile="/sf/os/graphics/graphicsaccelaration/3d_opengl_es_1_1/group"/>
+ </component>
+ <component name="2d_openvg_1_1" filter="s60" long-name="2D OpenVG 1.1" introduced="^3">
+ <unit bldFile="/sf/os/graphics/graphicsaccelaration/2D_OpenVG_1_1/group"/>
+ </component>
+ <component name="vgi" filter="s60" long-name="VGI">
+ <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
+ </component>
+ </collection>
+ <collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+ <component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
+ <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
+ </component>
+ </collection>
+ <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
+ <component name="graphicsresource" long-name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresource/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
+ </component>
+ <component name="graphicsresourceadaptation" long-name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicsutils" long-name="Graphics Utils" level="engines">
+ <component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/sf/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+ <!-- displayldd to be moved here -->
+ <component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/sf/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicscomposition" long-name="Graphics Composition" level="engines">
+ <component name="openwfcinterface" long-name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcinterface/group" mrp="/sf/os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+ </component>
+ <component name="openwfcompositionengine" long-name="OpenWF Composition Engine" introduced="^3" purpose="development">
+ <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+ </component>
+ <component name="openwfsupport" long-name="OpenWF Support" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicscomposition/openwfsupport/group" mrp="/sf/os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+ </component>
+ <component name="surfaceupdate" long-name="Surface Update" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicscomposition/surfaceupdate/group" mrp="/sf/os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicstest" long-name="Graphics Test" level="app-if">
+ <component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
+ <unit mrp="/sf/os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="/sf/os/graphics/graphicstest/graphicstestharness/group"/>
+ </component>
+ <component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development">
+ <unit bldFile="/sf/os/graphics/graphicstest/uibench/group" mrp="/sf/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphics_info" long-name="Graphics Info" level="app-if">
+ <component name="graphics_plat" filter="s60" long-name="Graphics Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/graphics/graphics_plat/group"/>
+ </component>
+ <component name="graphics_pub" filter="s60" long-name="Graphics Public Interfaces" class="api">
+ <unit bldFile="/sf/os/graphics/graphics_pub/group"/>
+ </component>
+ <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+ </component>
+ <component name="graphics_metadata" long-name="Graphics Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="windowing" long-name="Windowing" level="app-if">
+ <component name="windowserver" long-name="Window Server" purpose="mandatory">
+ <unit bldFile="/sf/os/graphics/windowing/windowserver/group" mrp="/sf/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+ </component>
+ <component name="windowserverplugins" long-name="Window Server Plugins" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/graphics/windowing/windowserverplugins/group" mrp="/sf/os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+ </component>
+ </collection>
+ <collection name="printingservices" long-name="Printing Services" level="app-if">
+ <component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
+ <unit bldFile="/sf/os/graphics/printingservices/printerdriversupport/group" mrp="/sf/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+ </component>
+ <component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/graphics/printingservices/printerdrivers/group" mrp="/sf/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+ </component>
+ </collection>
+ <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
+ <component name="fontandbitmapserver" long-name="Font and Bitmap Server" purpose="mandatory">
+ <unit bldFile="/sf/os/graphics/fbs/fontandbitmapserver/group" mrp="/sf/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
+ </component>
+ </collection>
+ <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+ <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/graphics/opengles/openglesinterface/group" mrp="/sf/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
+ </component>
+ </collection>
+ <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+ <component name="openvginterface" long-name="OpenVG Interface" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/graphics/openvg/openvginterface/group" mrp="/sf/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
+ </component>
+ <component name="openvg11" filter="s60" long-name="OpenVG 1.1">
+ <!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
+ <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/>
+ </component>
+ </collection>
+ <collection name="egl" long-name="EGL" level="internal-adaptations">
+ <component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/graphics/egl/eglinterface/group" mrp="/sf/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
+ </component>
+ <component name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/egl/eglswitch/group" mrp="/sf/os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
+ </component>
+ <component name="eglrefimpl" long-name="EGL Reference Implementation" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/egl/eglrefimpl/group" mrp="/sf/os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+ </component>
+ <component name="egltest" long-name="EGL Tests" introduced="^3" purpose="development">
+ <unit bldFile="/sf/os/graphics/egl/egltest/group" mrp="/sf/os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
+ <component name="gdi" long-name="GDI" purpose="mandatory">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+ </component>
+ <component name="bitgdi" long-name="BitGDI" purpose="mandatory">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+ </component>
+ <component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+ </component>
+ <component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/sf/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+ </component>
+ <component name="directgdi" long-name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
+ </component>
+ <component name="directgdiinterface" long-name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
+ </component>
+ <component name="directgdiadaptation" long-name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/sf/os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
+ <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
+ <unit bldFile="/sf/os/graphics/graphicstools/gdi_tools/group" mrp="/sf/os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+ </component>
+ </collection>
+ <collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if">
+ <component name="graphicssvs" long-name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="/sf/os/graphics/graphicsapitest/graphicssvs/group"/>
+ </component>
+ <component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/graphics/graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="/sf/os/graphics/graphicsapitest/screendriverhaitest/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/graphics/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+ <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+ <component id="vgi" filter="s60" name="VGI">
+ <unit bldFile="graphicsaccelaration/vgi/group"/>
+ </component>
+ </collection>
+ <collection id="m3g" name="Mobile 3D Graphics" level="internal-adaptations">
+ <component id="m3gcore11" filter="s60" name="M3G Core 1.1">
+ <unit bldFile="m3g/m3gcore11/group"/>
+ </component>
+ </collection>
+ <collection id="graphicsresourceservices" name="Graphics Resource Services" level="engines">
+ <component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="graphicsresourceservices/graphicsresource/group" mrp="graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
+ </component>
+ <component id="graphicsresourceadaptation" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="graphicsresourceservices/graphicsresourceadaptation/group" mrp="graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicsutils" name="Graphics Utils" level="engines">
+ <component id="commongraphicsheaders" name="Common Graphics Headers" introduced="^3" purpose="mandatory">
+ <unit bldFile="graphicsutils/commongraphicsheaders/group" mrp="graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+ <!-- displayldd to be moved here -->
+ <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
+ <unit bldFile="graphicshwdrivers/surfacemgr/group" mrp="graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicscomposition" name="Graphics Composition" level="engines">
+ <component id="openwfcinterface" name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+ <unit bldFile="graphicscomposition/openwfcinterface/group" mrp="graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+ </component>
+ <component id="openwfcompositionengine" name="OpenWF Composition Engine" introduced="^3" purpose="development">
+ <unit bldFile="graphicscomposition/openwfcompositionengine/group" mrp="graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+ </component>
+ <component id="openwfsupport" name="OpenWF Support" introduced="^3" purpose="optional">
+ <unit bldFile="graphicscomposition/openwfsupport/group" mrp="graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+ </component>
+ <component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
+ <unit bldFile="graphicscomposition/surfaceupdate/group" mrp="graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicstest" name="Graphics Test" level="app-if">
+ <component id="graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
+ <unit mrp="graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="graphicstest/graphicstestharness/group"/>
+ </component>
+ <component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
+ <unit bldFile="graphicstest/uibench/group" mrp="graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphics_info" name="Graphics Info" level="app-if">
+ <component id="graphics_pub" filter="s60" name="Graphics Public Interfaces" class="api">
+ <!-- is this a real public API? -->
+ <!-- <unit bldFile="graphics_pub/group"/> -->
+ </component>
+ <component id="graphics_plat" filter="s60" name="Graphics Platform Interfaces" class="api">
+ <unit bldFile="graphics_plat/group"/>
+ </component>
+ <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
+ <unit mrp="graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+ </component>
+ <component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection id="windowing" name="Windowing" level="app-if">
+ <component id="windowserver" name="Window Server" purpose="mandatory">
+ <unit bldFile="windowing/windowserver/group" mrp="windowing/windowserver/group/graphics_wserv.mrp"/>
+ </component>
+ <component id="windowserverplugins" name="Window Server Plugins" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="windowing/windowserverplugins/group" mrp="windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+ </component>
+ </collection>
+ <collection id="printingservices" name="Printing Services" level="app-if">
+ <component id="printerdriversupport" name="Printer Driver Support" purpose="optional">
+ <unit bldFile="printingservices/printerdriversupport/group" mrp="printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+ </component>
+ <component id="printerdrivers" name="Printer Drivers" purpose="optional" class="plugin">
+ <unit bldFile="printingservices/printerdrivers/group" mrp="printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+ </component>
+ </collection>
+ <collection id="fbs" name="Font and Bitmap Server" level="device-interface">
+ <component id="fontandbitmapserver" name="Font and Bitmap Server" purpose="mandatory">
+ <unit bldFile="fbs/fontandbitmapserver/group" mrp="fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
+ </component>
+ </collection>
+ <collection id="opengles" name="OpenGLES" level="internal-adaptations">
+ <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
+ <unit bldFile="opengles/openglesinterface/group" mrp="opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
+ </component>
+ </collection>
+ <collection id="openvg" name="OpenVG" level="internal-adaptations">
+ <component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional">
+ <unit bldFile="openvg/openvginterface/group" mrp="openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
+ </component>
+ <component id="openvg11" filter="s60" name="OpenVG 1.1">
+ <unit bldFile="openvg/openvginterface/group/openvg11"/>
+ </component>
+ </collection>
+ <collection id="egl" name="EGL" level="internal-adaptations">
+ <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
+ <unit bldFile="egl/eglinterface/group" mrp="egl/eglinterface/group/graphics_eglheaders.mrp"/>
+ </component>
+ <component id="eglswitch" name="EGL Switch" introduced="^3" purpose="optional">
+ <unit bldFile="egl/eglswitch/group" mrp="egl/eglswitch/group/graphics_eglswitch.mrp"/>
+ </component>
+ <component id="eglrefimpl" name="EGL Reference Implementation" introduced="^3" purpose="optional">
+ <unit bldFile="egl/eglrefimpl/group" mrp="egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+ </component>
+ <component id="egltest" name="EGL Tests" introduced="^3" purpose="development">
+ <unit bldFile="egl/egltest/group" mrp="egl/egltest/group/graphics_egltest.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
+ <component id="gdi" name="GDI" purpose="mandatory">
+ <unit bldFile="graphicsdeviceinterface/gdi/group" mrp="graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+ </component>
+ <component id="bitgdi" name="BitGDI" purpose="mandatory">
+ <unit bldFile="graphicsdeviceinterface/bitgdi/group" mrp="graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+ </component>
+ <component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
+ <unit bldFile="graphicsdeviceinterface/colourpalette/group" mrp="graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+ </component>
+ <component id="screendriver" name="Screen Driver" introduced="6.1" purpose="optional" class="plugin">
+ <unit bldFile="graphicsdeviceinterface/screendriver/group" mrp="graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+ </component>
+ <component id="directgdi" name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="graphicsdeviceinterface/directgdi/group" mrp="graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
+ </component>
+ <component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="graphicsdeviceinterface/directgdiinterface/group" mrp="graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
+ </component>
+ <component id="directgdiadaptation" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+ <unit bldFile="graphicsdeviceinterface/directgdiadaptation/group" mrp="graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicstools" name="Graphics Tools" level="internal-utils">
+ <component id="gdi_tools" name="GDI Tools" purpose="development" target="desktop">
+ <unit bldFile="graphicstools/gdi_tools/group" mrp="graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+ </component>
+ </collection>
+ <collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
+ <component id="graphicssvs" name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="graphicsapitest/graphicssvs/group"/>
+ </component>
+ <component id="screendriverhaitest" name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="graphicsapitest/screendriverhaitest/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/imagingext/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/imagingext/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,109 +1,114 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os">
-<block name="imagingext">
-<collection name="s60">
-<component name="imagingext">
-<unit bldFile="/sf/os/imagingext/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+ <component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
+ <unit bldFile="/sf/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+ </component>
+ <component name="imageadaptationextensions_build" filter="s60" long-name="Image Adaptation Extensions Build">
+ <!-- Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
+ <unit bldFile="/sf/os/imagingext/imageadaptationextensions/group"/>
+ </component>
+ </collection>
+ <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
+ <component name="exiflib" filter="s60" long-name="Exif Library">
+ <unit bldFile="/sf/os/imagingext/imagingmodules/exiflib/group"/>
+ </component>
+ <component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
+ <unit bldFile="/sf/os/imagingext/imagingmodules/jp2kcodec/group"/>
+ </component>
+ </collection>
+ <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
+ <component name="imagingext_plat" filter="s60" long-name="Imaging Extensions Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/imagingext/imagingext_plat/group"/>
+ </component>
+ <component name="imagingext_pub" filter="s60" long-name="Imaging Extensions Public Interfaces" class="api">
+ <unit bldFile="/sf/os/imagingext/imagingext_pub/group"/>
+ </component>
+ <component name="imagingext_test" filter="s60,api_test" long-name="Imaging Extensions Platform API Tests" purpose="development">
+ <unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group"/>
+ </component>
+ <component name="imagingext_test" filter="s60,api_test" long-name="Imaging Extensions Public API Tests" purpose="development">
+ <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/tsrc/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/imagingext/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="imagingext" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
+ <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
+ <unit bldFile="imageadaptationextensions/iclextjpegapi/group"/>
+ </component>
+ <component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
+ <!-- consider moving the export from this bld.inf into the above one and remove this component -->
+ <unit bldFile="imageadaptationextensions/group"/>
+ </component>
+ </collection>
+ <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
+ <component id="exiflib" filter="s60" name="Exif Library">
+ <unit bldFile="imagingmodules/exiflib/group"/>
+ </component>
+ <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
+ <unit bldFile="imagingmodules/jp2kcodec/group"/>
+ </component>
+ </collection>
+ <collection id="imagingext_info" name="Imaging Extensions Info" level="app-if">
+ <component id="imagingext_plat" filter="s60" name="Imaging Extensions Platform Interfaces" class="api">
+ <unit bldFile="imagingext_plat/group"/>
+ </component>
+ <component id="imagingext_build" filter="s60" name="Imaging Extensions Build">
+ <unit bldFile="group"/>
+ </component>
+ <component id="imagingext_pub" filter="s60" name="Imaging Extensions Public Interfaces" class="api">
+ <unit bldFile="imagingext_pub/group"/>
+ <!-- does this tes unit need to be #included in the above one? -->
+ <!-- <unit bldFile="imagingext_pub/exif_api/tsrc/group"/> -->
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/kernelhwsrv/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/kernelhwsrv/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,234 +1,216 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
-<collection name="baseintegtests" long-name="Base Integration Testing" level="test">
-<component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="/sf/os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
-</component>
-</collection>
-<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-</component>
-</collection>
-<collection name="bsptemplate" long-name="BSP Template" level="hw-if">
-<component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
-</component>
-</collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
-<component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka" mrp="/sf/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
-</component>
-</collection>
-<collection name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="e32utils" long-name="E32 Utilities" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32utils/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
-</component>
-<component name="e32test" long-name="E32 Tests" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-</component>
-<component name="f32test" long-name="File Server Tests" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/kerneltest/f32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
-</component>
-</collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
-<component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
-</component>
-<component name="audioldd" long-name="Audio Drivers" introduced="8.1b" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/soundsc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>
-</component>
-<component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-</component>
-<component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
-<unit mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-</component>
-<component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
-<!-- these are LDDs for storage media-->
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-</component>
-<component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
-</component>
-<component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-</component>
-<component name="cameraldd" long-name="Camera Drivers" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-</component>
-</collection>
-<collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="mediadrivers" long-name="Media Drivers" purpose="optional">
-<!-- these are for storage media-->
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/media" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-</component>
-<component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-</component>
-</collection>
-<collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-<component name="euser" long-name="User Library" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/euser" mrp="/sf/os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-</component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/compsupp" mrp="/sf/os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-</component>
-<component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-</component>
-<component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-</component>
-<component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-</component>
-</collection>
-<collection name="filesystems" long-name="File Systems" level="framework">
-<component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
-<unit mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-</component>
-<component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-</component>
-<component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-</component>
-<component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
-</component>
-<component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-</component>
-<component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-</component>
-<component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-</component>
-</collection>
-<collection name="halservices" long-name="HAL Services" level="framework">
-<component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/halservices/hal" mrp="/sf/os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-</component>
-</collection>
-<collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-<component name="e32wsrv" long-name="Text Window Server" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/ewsrv" mrp="/sf/os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-</component>
-<component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-</component>
-</collection>
-<collection name="baseapitest" long-name="Base API Tests" level="test">
-<component name="basesvs" long-name="Base Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/kernelhwsrv/baseapitest/basesvs/group/basesvs.mrp"/>
-</component>
-</collection>
-<collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-<component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+ <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
+ <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
+ <unit mrp="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+ </component>
+ </collection>
+ <collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
+ <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development">
+ <unit bldFile="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
+ </component>
+ </collection>
+ <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+ <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka" mrp="/sf/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
+ </component>
+ </collection>
+ <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
+ <component name="e32utils" long-name="E32 Utilities" purpose="development">
+ <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32utils/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
+ </component>
+ <component name="e32test" long-name="E32 Tests" purpose="development">
+ <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+ </component>
+ <component name="f32test" long-name="File Server Tests" purpose="development">
+ <unit bldFile="/sf/os/kernelhwsrv/kerneltest/f32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
+ </component>
+ </collection>
+ <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+ <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
+ </component>
+ <component name="audioldd" long-name="Audio Drivers" introduced="8.1b" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/soundsc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>
+ </component>
+ <component name="serialldd" long-name="Serial Port Drivers" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+ </component>
+ <component name="legacydrivers" long-name="Legacy Drivers" purpose="optional">
+ <unit mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+ </component>
+ <component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+ <!-- these are LDDs for storage media-->
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+ </component>
+ <component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+ </component>
+ <component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+ </component>
+ <component name="cameraldd" long-name="Camera Drivers" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+ </component>
+ <component name="displayldd" long-name="Display Drivers" introduced="^3" purpose="optional">
+ <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+ </component>
+ <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
+ <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+ </component>
+ </collection>
+ <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
+ <component name="mediadrivers" long-name="Media Drivers" purpose="optional">
+ <!-- these are for storage media-->
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/media" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+ </component>
+ <component name="genericboardsupport" long-name="Generic Board Support" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+ </component>
+ </collection>
+ <collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
+ <component name="euser" long-name="User Library" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/euser" mrp="/sf/os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+ </component>
+ <component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/compsupp" mrp="/sf/os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+ </component>
+ <component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+ </component>
+ <component name="estart" long-name="Base Starter" filter="gt" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+ </component>
+ <component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+ </component>
+ </collection>
+ <collection name="filesystems" long-name="File Systems" level="framework">
+ <component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
+ <unit mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+ </component>
+ <component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+ </component>
+ <component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+ </component>
+ <component name="usbhostmssrv" long-name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+ </component>
+ <component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+ </component>
+ <component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+ </component>
+ <component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+ </component>
+ </collection>
+ <collection name="halservices" long-name="HAL Services" level="framework">
+ <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/halservices/hal" mrp="/sf/os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+ </component>
+ </collection>
+ <collection name="textmodeshell" long-name="Text Mode Shell" level="test">
+ <component name="e32wsrv" long-name="Text Window Server" purpose="optional">
+ <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/ewsrv" mrp="/sf/os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+ </component>
+ <component name="textshell" long-name="Text Shell" filter="gt" purpose="development">
+ <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+ </component>
+ </collection>
+ <collection name="baseapitest" long-name="Base API Tests" level="test">
+ <component name="basesvs" long-name="Base Verification Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/kernelhwsrv/baseapitest/basesvs/group/basesvs.mrp" bldFile="/sf/os/kernelhwsrv/baseapitest/basesvs/group"/>
+ </component>
+ </collection>
+ <collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
+ <component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/kernelhwsrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="kernelhwsrv" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+ <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
+ <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
+ <unit mrp="brdbootldr/ubootldr/base_ubootldr.mrp"/>
+ </component>
+ </collection>
+ <collection id="bsptemplate" name="Board Support Package Template" level="hw-if">
+ <component id="asspandvariant" name="Template ASSP and Variant" introduced="6.0" purpose="development">
+ <unit bldFile="bsptemplate/asspandvariant/template_variant" mrp="bsptemplate/asspandvariant/base_template.mrp"/>
+ </component>
+ </collection>
+ <collection id="kernel" name="Kernel Architecture" level="adaptation">
+ <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
+ <unit bldFile="kernel/eka" mrp="kernel/eka/base_e32.mrp"/>
+ </component>
+ </collection>
+ <collection id="kerneltest" name="Kernel Test" level="hw-if">
+ <component id="e32utils" name="E32 Utilities" purpose="development">
+ <unit bldFile="kerneltest/e32utils/group" mrp="kerneltest/e32utils/group/base_e32utils.mrp"/>
+ </component>
+ <component id="e32test" name="E32 Tests" purpose="development">
+ <unit bldFile="kerneltest/e32test/group" mrp="kerneltest/e32test/group/base_e32test.mrp"/>
+ </component>
+ <component id="f32test" name="File Server Tests" purpose="development">
+ <unit bldFile="kerneltest/f32test/group" mrp="kerneltest/f32test/group/base_f32test.mrp"/>
+ </component>
+ </collection>
+ <collection id="ldds" name="Logical Device Drivers" level="adaptation">
+ <component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
+ <unit bldFile="kernel/eka/drivers/ethernet" mrp="kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
+ </component>
+ <component id="audioldd" name="Audio Drivers" introduced="8.1b" purpose="optional">
+ <unit bldFile="kernel/eka/drivers/soundsc" mrp="kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>
+ </component>
+ <component id="serialldd" name="Serial Port Drivers" purpose="optional">
+ <unit bldFile="kernel/eka/drivers/ecomm" mrp="kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+ </component>
+ <component id="legacydrivers" name="Legacy Drivers" purpose="optional">
+ <unit mrp="kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+ </component>
+ <component id="locmedia" name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+ <!-- these are LDDs for storage media-->
+ <unit bldFile="kernel/eka/drivers/locmedia" mrp="kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+ </component>
+ <component id="runmodedebugger" name="Run Mode Debugger" purpose="mandatory">
+ <unit bldFile="kernel/eka/drivers/debug/group" mrp="kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+ </component>
+ <component id="btrace" name="Kernel Trace Tool" purpose="mandatory">
+ <unit bldFile="kernel/eka/drivers/trace" mrp="kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+ </component>
+ <component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional">
+ <unit bldFile="kernel/eka/drivers/camerasc" mrp="kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+ </component>
+ <component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional">
+ <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+ <unit bldFile="kernel/eka/drivers/display" mrp="kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+ </component>
+ <component id="usbclientdrivers" name="USB Client Drivers" introduced="8.1b" purpose="optional">
+ <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+ <unit bldFile="kernel/eka/drivers/usbc" mrp="kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+ </component>
+ </collection>
+ <collection id="driversupport" name="Generic Driver Support" level="hw-if">
+ <component id="mediadrivers" name="Media Drivers" purpose="optional">
+ <!-- these are for storage media-->
+ <unit bldFile="kernel/eka/drivers/media" mrp="kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+ </component>
+ <component id="genericboardsupport" name="Generic Board Support" purpose="optional">
+ <unit bldFile="kernel/eka/drivers/bsp" mrp="kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+ </component>
+ </collection>
+ <collection id="userlibandfileserver" name="User Library and File Server" level="framework">
+ <component id="euser" name="User Library" purpose="mandatory">
+ <unit bldFile="kernel/eka/euser" mrp="kernel/eka/euser/base_e32_euser.mrp"/>
+ </component>
+ <component id="compsupp" name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+ <unit bldFile="kernel/eka/compsupp" mrp="kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+ </component>
+ <component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
+ <unit bldFile="userlibandfileserver/fileserver/group" mrp="userlibandfileserver/fileserver/group/base_f32.mrp"/>
+ </component>
+ <component id="estart" name="Base Starter" filter="gt" purpose="optional">
+ <unit bldFile="userlibandfileserver/fileserver/estart" mrp="userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+ </component>
+ <component id="domainmgr" name="Domain Manager" introduced="8.1b" purpose="mandatory">
+ <unit bldFile="userlibandfileserver/domainmgr/group" mrp="userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+ </component>
+ </collection>
+ <collection id="filesystems" name="File Systems" level="framework">
+ <component id="romfs" name="ROM File System" filter="gt" purpose="optional" class="plugin">
+ <unit mrp="userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+ </component>
+ <component id="rofs" name="ROFS" filter="gt" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/srofs" mrp="userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+ </component>
+ <component id="usbmsfs" name="USB Mass Storage File System" filter="gt" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/smassstorage" mrp="userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+ </component>
+ <component id="usbhostmssrv" name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/shostmassstorage" mrp="userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+ </component>
+ <component id="fat32fs" name="FAT32 File System" filter="gt" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/sfat32" mrp="userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+ </component>
+ <component id="fatfs" name="FAT File System" filter="gt" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/sfat" mrp="userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+ </component>
+ <component id="compfs" name="Composite File System" filter="gt" purpose="optional" class="plugin">
+ <unit bldFile="userlibandfileserver/fileserver/scomp" mrp="userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+ </component>
+ </collection>
+ <collection id="halservices" name="HAL Services" level="framework">
+ <component id="hal" name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+ <unit bldFile="halservices/hal" mrp="halservices/hal/base_hal.mrp"/>
+ </component>
+ </collection>
+ <collection id="textmodeshell" name="Text Mode Shell" level="test">
+ <component id="e32wsrv" name="Text Window Server" purpose="optional">
+ <unit bldFile="kernel/eka/ewsrv" mrp="kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+ </component>
+ <component id="textshell" name="Text Shell" filter="gt" purpose="development">
+ <unit bldFile="userlibandfileserver/fileserver/etshell" mrp="userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+ </component>
+ </collection>
+ <collection id="baseapitest" name="Base API Tests" level="test">
+ <component id="basesvs" name="Base Verification Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="baseapitest/basesvs/group/basesvs.mrp" bldFile="baseapitest/basesvs/group"/>
+ </component>
+ </collection>
+ <collection id="kernelhwsrv_info" name="Kernel and Hardware Services Info" level="test">
+ <component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/lbs/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/lbs/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,184 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
-<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-</component>
-<component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-</component>
-<component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-</component>
-<component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
-</component>
-<component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
-</component>
-</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-</component>
-</collection>
-<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-<component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationrequestmgmt/locationserver/group" mrp="/sf/os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
-</component>
-<component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-</component>
-</collection>
-<collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-<component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development">
-<unit mrp="/sf/os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp"/>
-</component>
-<component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/lbs/lbstest/locationprotocoltest/group" mrp="/sf/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-</component>
-</collection>
-<collection name="locationmgmt" long-name="Location Management" level="management">
-<component name="locmonitor" long-name="Location Monitor" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
-</component>
-<component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/sf/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-</component>
-<component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/networklocationmgr/group" mrp="/sf/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-</component>
-<component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/locationcore/group" mrp="/sf/os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-</component>
-<component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/os/lbs/locationmgmt/networkgateway/group" mrp="/sf/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="tb92" purpose="optional" plugin="Y" class="placeholder">
-<!-- PLACEHOLDER="DS.1806"
- <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
- -->
-</component>
-</collection>
-<collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
-<component name="lbshaitest" long-name="Location HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/lbs/lbsapitest/lbshaitest/group/lbshaitest.mrp"/>
-</component>
-</collection>
-<collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-<component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="lodo.lbs">
-<unit bldFile="/sf/os/lbs/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+ <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
+ <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+ </component>
+ <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+ </component>
+ <component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="^2" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+ </component>
+ <component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+ </component>
+ <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+ </component>
+ <component name="locationapesuplpsy" long-name="APE SUPL PSY" introduced="^3" purpose="optional" filter="s60" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
+ </component>
+ <component name="npeintegmodule" long-name="NPE Integration Module" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/npeintegmodule/group" mrp="/sf/os/lbs/datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
+ </component>
+ <component name="datasourcemodules_build" long-name="Data Source Modules Build" introduced="^3" purpose="optional" filter="s60">
+ <!-- need to move the exports to another component, or make this a real component by removing the #include and moving down a directory -->
+ <unit bldFile="/sf/os/lbs/datasourcemodules/group"/>
+ </component>
+ </collection>
+ <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+ <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+ </component>
+ </collection>
+ <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
+ <component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationrequestmgmt/locationserver/group" mrp="/sf/os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+ </component>
+ <component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+ </component>
+ </collection>
+ <collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
+ <component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="/sf/os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="/sf/os/lbs/lbstest/lbstestproduct/group"/>
+ </component>
+ <component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/lbs/lbstest/locationprotocoltest/group" mrp="/sf/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+ </component>
+ </collection>
+ <collection name="locationmgmt" long-name="Location Management" level="management">
+ <component name="locmonitor" long-name="Location Monitor" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/sf/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+ </component>
+ <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/sf/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+ </component>
+ <component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationmgmt/networklocationmgr/group" mrp="/sf/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+ </component>
+ <component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationmgmt/locationcore/group" mrp="/sf/os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
+ </component>
+ <component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional">
+ <unit bldFile="/sf/os/lbs/locationmgmt/networkgateway/group" mrp="/sf/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+ </component>
+ </collection>
+ <collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+ <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+ </component>
+ <component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+ </component>
+ </collection>
+ <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
+ <component name="lbshaitest" long-name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/lbs/lbsapitest/lbshaitest/group/lbshaitest.mrp" bldFile="/sf/os/lbs/lbsapitest/lbshaitest/group"/>
+ </component>
+ </collection>
+ <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
+ <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/lbs/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="lbs" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+ <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
+ <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/defaultpositioningmodule/group" mrp="datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+ </component>
+ <component id="bluetoothgpspositioningmodule" name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/bluetoothgpspositioningmodule/group" mrp="datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+ </component>
+ <component id="simulationpositioningmodule" name="Simulation Positioning Module" introduced="^2" purpose="development" class="plugin">
+ <unit bldFile="datasourcemodules/simulationpositioningmodule/group" mrp="datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+ </component>
+ <component id="gpspositioningmodule" name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/gpspositioningmodule/group" mrp="datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+ </component>
+ <component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/networkpositioningmodule/group" mrp="datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+ </component>
+ <component id="npeintegmodule" name="NPE Integration Module" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/npeintegmodule/group" mrp="datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
+ </component>
+ </collection>
+ <collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+ <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="datasourceadaptation/gpsdatasourceadaptation/group" mrp="datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+ </component>
+ </collection>
+ <collection id="locationrequestmgmt" name="Location Request Management" level="application-interface">
+ <component id="locationserver" name="Location Server" introduced="9.2" purpose="optional">
+ <unit bldFile="locationrequestmgmt/locationserver/group" mrp="locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+ </component>
+ <component id="networkrequesthandler" name="Network Request Handler" introduced="9.2" purpose="optional">
+ <unit bldFile="locationrequestmgmt/networkrequesthandler/group" mrp="locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+ </component>
+ </collection>
+ <collection id="lbstest" name="Locating Services Tests" level="application-interface">
+ <component id="lbstestproduct" name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="lbstest/lbstestproduct/group"/>
+ </component>
+ <component id="locationprotocoltest" name="Location Protocol Tests" introduced="9.2" purpose="development" class="plugin">
+ <unit bldFile="lbstest/locationprotocoltest/group" mrp="lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+ </component>
+ </collection>
+ <collection id="locationmgmt" name="Location Management" level="management">
+ <component id="locmonitor" name="Location Monitor" introduced="^3" purpose="optional">
+ <unit bldFile="locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+ </component>
+ <component id="agpslocationmgr" name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/agpslocationmgr/group" mrp="locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+ </component>
+ <component id="networklocationmgr" name="Network Location Manager" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/networklocationmgr/group" mrp="locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+ </component>
+ <component id="locationcore" name="Location Core" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/locationcore/group" mrp="locationmgmt/locationcore/group/lbs_admin.mrp"/>
+ </component>
+ <component id="networkgateway" name="Network Gateway" introduced="9.2" purpose="optional">
+ <unit bldFile="locationmgmt/networkgateway/group" mrp="locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+ <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+ </component>
+ <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+ </component>
+ </collection>
+ <collection id="lbsapitest" name="Location API Tests" level="application-interface">
+ <component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="lbsapitest/lbshaitest/group/lbshaitest.mrp" bldFile="lbsapitest/lbshaitest/group"/>
+ </component>
+ </collection>
+ <collection id="lbs_info" name="Locating Services Info" level="application-interface">
+ <component id="lbs_metadata" name="Locating Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/mm/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/mm/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,356 +1,329 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
-<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-<component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-</component>
-<component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development">
-<unit mrp="/sf/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp"/>
-</component>
-<component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development">
-<unit mrp="/sf/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp"/>
-</component>
-<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/mm/imagingandcamerafws/camerafw/group" mrp="/sf/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-</component>
-<component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development">
-<unit mrp="/sf/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"/>
-</component>
-</collection>
-<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-<component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-<!-- PLACEHOLDER="DEF137894" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmutilitylib/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmutilitylib/group/multimedia_common.mrp"/>
-<!-- PLACEHOLDER="DEF137894" END REMOVE -->
-<!-- PLACEHOLDER="DEF137894"
- <unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
- -->
-</component>
-</collection>
-<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/plugins/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/plugins/group/multimedia_icl_plugin.mrp"/>
-</component>
-<component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/mm/mmplugins/cameraplugins/group" mrp="/sf/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-</component>
-<component name="lib3gp" long-name="3GP Library" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/mmplugins/lib3gp/group" mrp="/sf/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-</component>
-<component name="lib3gpunittest" long-name="3GP Unit Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp"/>
-</component>
-</collection>
-<collection name="mm_info" long-name="Multimedia Info" level="app-if">
-<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-</component>
-<component name="mm_metadata" long-name="Multimedia Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-</component>
-</collection>
-<collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-<component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb91" purpose="development">
-<unit bldFile="/sf/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/sf/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-</component>
-<!-- decsionfw is not used in any active configuration yet
- <component id="decisionfw" name="Decision Framework" introduced="Future" purpose="optional">
- <unit bldFile="mmresourcemgmt/decisionfw/group" mrp="mmresourcemgmt/decisionfw/group/multimedia_mmrcfw.mrp"/>
- </component>
- -->
-<!-- mmgmtengine in not used in any active configuration yet
- <component id="mmmgmtengine" name="Multimedia Management Engine" introduced="Future" purpose="optional">
- <unit bldFile="mmresourcemgmt/mmmgmtengine/group" mrp="mmresourcemgmt/mmmgmtengine/group/multimedia_mgtengine.mrp"/>
- </component>
- -->
-</collection>
-<collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-<component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
-<unit bldFile="/sf/os/mm/mmdevicefw/mdf/group" mrp="/sf/os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-</component>
-<!-- mdf2 is not used in any active configuration yet
- <component id="mdf2" name="Media Device Framework 2" introduced="Future" purpose="optional">
- <unit bldFile="mmdevicefw/mdf2/group" mrp="mmdevicefw/mdf2/group/multimedia_mm-infras.mrp"/>
- </component>
- -->
-<component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development">
-<unit mrp="/sf/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"/>
-</component>
-<component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
-</component>
-</collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
-<component name="videorenderer" long-name="Video Renderer" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/mm/mmswadaptation/videorenderer/group" mrp="/sf/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
-</component>
-</collection>
-<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
-<component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp"/>
-</component>
-<component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp"/>
-</component>
-<component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp"/>
-</component>
-<component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development">
-<unit mrp="/sf/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp"/>
-</component>
-</collection>
-<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-<component name="omxilapi" long-name="OpenMAX IL API" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/mm/omxil/omxilapi/group" mrp="/sf/os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
-<!-- not used in an active conifguration
- <unit version="2" bldFile="omxil/omxilapi2/group" mrp="omxil/omxilapi2/group/multimedia_omx_il_api.mrp"/>
- -->
-</component>
-<component name="omxilcore" long-name="OpenMAX IL Core" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/mm/omxil/omxilcore/group" mrp="/sf/os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
-<!-- not used in an active conifguration
- <unit version="2" bldFile="omxil/omxilcore2/group" mrp="omxil/omxilcore2/group/multimedia_omx_il_core.mrp"/>
- -->
-</component>
-<!-- not used in an active conifguration
- <component id="omxilcompfw" name="OpenMAX IL Component Framework" introduced="Future" purpose="optional">
- <unit bldFile="omxil/omxilcompfw/components/group" mrp="omxil/omxilcompfw/components/group/multimedia_omx_il_comp.mrp"/>
- </component>
- -->
-<component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/mm/omxil/omxilrefcomps/ref_components/group" mrp="/sf/os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
-<!-- not used in an active conifguration
- <unit version="2" bldFile="mmdataplane/omxiltranslators/group_omx_ref_components" mrp="mmdataplane/omxiltranslators/group_omx_ref_components/multimedia_omx_il_comp_ref.mrp"/>
- -->
-</component>
-<component name="omxilunittest" long-name="OpenMAX IL Unit Tests" introduced="tb92" purpose="development">
-<unit mrp="/sf/os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp"/>
-</component>
-<component name="omxilcoreconftest" long-name="OpenMAX IL Core Conformance Suite" introduced="tb92" purpose="development">
-<unit mrp="/sf/os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp"/>
-</component>
-<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="tb92" purpose="development">
-<unit bldFile="/sf/os/mm/omxil/mmilapi/group" mrp="/sf/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
-</component>
-</collection>
-<collection name="devsound" long-name="Sound Device" level="devices">
-<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api/multimedia_mdf_devsound_api.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
- <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
- -->
-</component>
-<component name="a3fdevsound" long-name="A3F DevSound" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/devsound/a3fdevsound/group" mrp="/sf/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-</component>
-<component name="a3facf" long-name="A3F Audio Component Framework" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/devsound/a3facf/group" mrp="/sf/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-</component>
-<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport/multimedia_mdf_devsound_pluginsupport.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
- <unit bldFile="devsound/devsoundpluginsupport/group" mrp="devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
- -->
-</component>
-<component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin/multimedia_mdf_devsound_refplugin.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
- <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
- -->
-</component>
-<component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
- <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
- -->
-</component>
-<component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb91" purpose="development">
-<unit bldFile="/sf/os/mm/devsound/a3ftrace/group" mrp="/sf/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-</component>
-<component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp"/>
-</component>
-<component name="a3fsrvstart" long-name="A3F Server Start" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/mm/devsound/a3fsrvstart/group" mrp="/sf/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-</component>
-</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-<component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
-<!-- PLACEHOLDER="DEF137592" START REMOVE -->
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
-<!-- PLACEHOLDER="DEF137592" END REMOVE -->
-<!-- PLACEHOLDER="DEF137592"
- <unit bldFile="devsound/hwdevapi/group" mrp="devsound/sounddevbt/group/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
- -->
-</component>
-<component name="a3facl" long-name="A3F Audio Component Library" introduced="tb91" purpose="development">
-<unit bldFile="/sf/os/mm/mmhais/a3facl/group" mrp="/sf/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
-</component>
-<component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
-</component>
-<component name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/mmhais/refacladapt/group" mrp="/sf/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
-</component>
-<component name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/os/mm/mmhais/videohai/group" mrp="/sf/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
-</component>
-<component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb91" purpose="optional">
-<unit bldFile="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
-</component>
-<component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp"/>
-</component>
-</collection>
-<!-- not used in an active configuration
- <collection id="mmhostprocess" name="Multimedia Host Process" level="devices">
- <component id="mmhpvideoclient" name="MMHP Video Client" introduced="Future" purpose="optional">
- <unit bldFile="mmhostprocess/mmhpvideoclient/mmvideocomponents/group" mrp="mmhostprocess/mmhpvideoclient/mmvideocomponents/group/multimedia_mmhp_video_client.mrp"/>
- </component>
- <component id="mmhpaudioclient" name="MMHP Audio Client" introduced="Future" purpose="optional">
- <unit bldFile="mmhostprocess/mmhpaudioclient/mmaudiocomponents/group" mrp="mmhostprocess/mmhpaudioclient/mmaudiocomponents/group/multimedia_mmhp_audio_client.mrp"/>
- </component>
- <component id="mmhpcameraclient" name="MMHP Camera Client" introduced="Future" purpose="optional">
- <unit bldFile="mmhostprocess/mmhpcameraclient/mmcameracomponents/group" mrp="mmhostprocess/mmhpcameraclient/mmcameracomponents/group/multimedia_mmhp_camera_client.mrp"/>
- </component>
- </collection>
- -->
-<!-- not used in an active configuraiton
- <collection id="mmdataplane" name="Multimedia Data Plane Adaptation" level="hw-if">
- <component id="omxilnodes" name="OpenMAX IL Data Plane Nodes" introduced="Future" purpose="optional" class="plugin">
- <unit bldFile="mmdataplane/omxilnodes/group" mrp="mmdataplane/omxilnodes/group/multimedia_data_plane_nodes.mrp"/>
- </component>
- <component id="omxiltranslators" name="OpenMAX IL Translators" introduced="Future" purpose="optional" class="plugin">
- <unit bldFile="mmdataplane/omxiltranslators/group_translators" mrp="mmdataplane/omxiltranslators/group_translators/multimedia_openmax_il_translators.mrp"/>
- </component>
- </collection>
- -->
-<collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
-<component name="mmsvs" long-name="Multimedia Verification Suite" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
-</component>
-<component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmapitest/devvideohaitest/group/devvideohaitest.mrp"/>
-</component>
-<component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmapitest/devsoundhaitest/group/devsoundhaitest.mrp"/>
-</component>
-<component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="mm">
-<unit bldFile="/sf/os/mm/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+ <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
+ <component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
+ <unit bldFile="/sf/os/mm/devsoundextensions/drmaudioplayer/group"/>
+ </component>
+ <component name="mmextfw" filter="s60" long-name="Multimedia Extension Framework">
+ <unit bldFile="/sf/os/mm/devsoundextensions/mmextfw/group"/>
+ </component>
+ <component name="audiorouting" filter="s60" long-name="Audio Routing">
+ <unit bldFile="/sf/os/mm/devsoundextensions/audiorouting/group"/>
+ </component>
+ <component name="effects" filter="s60" long-name="Effects">
+ <unit bldFile="/sf/os/mm/devsoundextensions/effects/group"/>
+ </component>
+ <component name="effectspresets" filter="s60" long-name="Effects Presets">
+ <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/group"/>
+ </component>
+ <component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
+ <!-- need to #include the lot from a single bld.inf
+ Also move to a stanard component location, not under effectspresets -->
+ <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+ <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+ <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
+ </component>
+ <component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
+ <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
+ </component>
+ <component name="mmfcustominterfaces" filter="s60" long-name="MMF Custom Interfaces">
+ <unit bldFile="/sf/os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+ </component>
+ <component name="addeddevsoundcontrol" filter="s60" long-name="Added DevSound Control">
+ <unit bldFile="/sf/os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+ </component>
+ <component name="globalaudiosettings" filter="s60" long-name="Global Audio Settings">
+ <unit bldFile="/sf/os/mm/devsoundextensions/globalaudiosettings/group"/>
+ </component>
+ <component name="restrictedaudiooutput" filter="s60" long-name="Restricted Audio Output">
+ <unit bldFile="/sf/os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+ </component>
+ <component name="ciextnfactoryplugins" filter="s60" long-name="Custom Interface Extension Factory Plugins" plugin="Y">
+ <unit bldFile="/sf/os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
+ </component>
+ </collection>
+ <collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
+ <component name="arm_mdf_postprocessor" filter="s60" long-name="ARM MDF Postprocessor">
+ <unit bldFile="/sf/os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
+ </component>
+ <component name="nga_mdf_tsrc" long-name="NGA MDF Tests" purpose="development" filter="s60,pref_test,module_test">
+ <unit bldFile="/sf/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group"/>
+ </component>
+ </collection>
+ <collection name="audio" long-name="Audio Codecs" level="middleware">
+ <component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
+ <unit bldFile="/sf/os/mm/audio/arm_cmmf_codecs/group"/>
+ </component>
+ </collection>
+ <collection name="video" long-name="Video Codecs" level="middleware">
+ <!-- empty -->
+ </collection>
+ <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
+ <component name="postingsurface" filter="s60" long-name="Posting Surface">
+ <unit bldFile="/sf/os/mm/videoadaptationextensions/postingsurface/group"/>
+ </component>
+ </collection>
+ <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
+ <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+ </component>
+ <component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/imagingunittest/group"/>
+ </component>
+ <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/imaginginttest/group"/>
+ </component>
+ <component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/mm/imagingandcamerafws/camerafw/group" mrp="/sf/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+ </component>
+ <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/cameraunittest/group"/>
+ </component>
+ </collection>
+ <collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
+ <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/mmlibs/mmutilitylib/group" mrp="/sf/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+ </component>
+ <component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/mmlibs/mmfw/group" mrp="/sf/os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
+ <component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/mm/mmplugins/imagingplugins/group" mrp="/sf/os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+ </component>
+ <component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/mm/mmplugins/cameraplugins/group" mrp="/sf/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+ </component>
+ <component name="lib3gp" long-name="3GP Library" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/mmplugins/lib3gp/group" mrp="/sf/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+ </component>
+ <component name="lib3gpunittest" long-name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="/sf/os/mm/mmplugins/lib3gpunittest/group"/>
+ </component>
+ <component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/mm/mmplugins/mmfwplugins/group" mrp="/sf/os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+ </component>
+ </collection>
+ <collection name="mm_info" long-name="Multimedia Info" level="app-if">
+ <component name="mm_plat" filter="s60" long-name="Multimedia Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/mm/mm_plat/group"/>
+ </component>
+ <component name="mm_pub" filter="s60" long-name="Multimedia Public Interfaces" class="api">
+ <unit bldFile="/sf/os/mm/mm_pub/group"/>
+ </component>
+ <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+ </component>
+ <component name="mm_tsrc" long-name="Multimedia Tests" purpose="development" filter="s60,api_test,pref_test">
+ <unit bldFile="/sf/os/mm/tsrc/group"/>
+ </component>
+ <component name="mm_metadata" long-name="Multimedia Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
+ <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="^2" purpose="development">
+ <unit bldFile="/sf/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/sf/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
+ <component name="mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/mmdevicefw/mdf/group" mrp="/sf/os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+ </component>
+ <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="/sf/os/mm/mmdevicefw/mdfunittest/group"/>
+ </component>
+ <component name="speechrecogsupport" long-name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/mmdevicefw/speechrecogsupport/group" mrp="/sf/os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+ <component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/mm/mmswadaptation/videorenderer/group" mrp="/sf/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
+ <component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestfw/group"/>
+ </component>
+ <component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestfwunittest/group"/>
+ </component>
+ <component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestagent/group"/>
+ </component>
+ <component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtesttools/Group"/>
+ </component>
+ </collection>
+ <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
+ <component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/mm/omxil/omxilapi/group" mrp="/sf/os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
+ </component>
+ <component name="omxilcore" long-name="OpenMAX IL Core" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/mm/omxil/omxilcore/group" mrp="/sf/os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
+ </component>
+ <component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/mm/omxil/omxilcomponentcommon/group" mrp="/sf/os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
+ </component>
+ <component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/mm/omxil/omxilrefcomps/ref_components/group" mrp="/sf/os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
+ </component>
+ <component name="omxilunittest" long-name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="/sf/os/mm/omxil/omxilunittest/group"/>
+ </component>
+ <component name="omxilcoreconftest" long-name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="/sf/os/mm/omxil/omxilcoreconftest/group"/>
+ </component>
+ <component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+ <unit bldFile="/sf/os/mm/omxil/mmilapi/group" mrp="/sf/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
+ </component>
+ </collection>
+ <collection name="devsound" long-name="Sound Device" level="devices">
+ <component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/devsound/devsoundapi/group" mrp="/sf/os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+ </component>
+ <component name="a3fdevsound" long-name="A3F DevSound" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/devsound/a3fdevsound/group" mrp="/sf/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+ </component>
+ <component name="a3facf" long-name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/devsound/a3facf/group" mrp="/sf/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+ </component>
+ <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/mm/devsound/devsoundpluginsupport/group" mrp="/sf/os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+ </component>
+ <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/mm/devsound/devsoundrefplugin/group" mrp="/sf/os/mm/devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
+ </component>
+ <component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/mm/devsound/sounddevbt/group" mrp="/sf/os/mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+ </component>
+ <component name="a3ftrace" long-name="A3F Trace Utility" introduced="^2" purpose="development">
+ <unit bldFile="/sf/os/mm/devsound/a3ftrace/group" mrp="/sf/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+ </component>
+ <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="/sf/os/mm/devsound/a3fintegrationtest/group"/>
+ </component>
+ <component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/mm/devsound/a3fsrvstart/group" mrp="/sf/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+ </component>
+ </collection>
+ <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+ <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/mm/devsound/hwdevapi/group" mrp="/sf/os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
+ </component>
+ <component name="a3facl" long-name="A3F Audio Component Library" introduced="^2" purpose="development">
+ <unit bldFile="/sf/os/mm/mmhais/a3facl/group" mrp="/sf/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
+ </component>
+ <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+ </component>
+ <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/mmhais/refacladapt/group" mrp="/sf/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+ </component>
+ <component name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/mm/mmhais/videohai/group" mrp="/sf/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
+ </component>
+ <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
+ <unit bldFile="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
+ </component>
+ <component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group"/>
+ </component>
+ </collection>
+ <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
+ <component name="mmsvs" long-name="Multimedia Verification Suite" introduced="^2" purpose="development">
+ <unit mrp="/sf/os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
+ </component>
+ <component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="/sf/os/mm/mmapitest/devvideohaitest/group"/>
+ </component>
+ <component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="/sf/os/mm/mmapitest/devsoundhaitest/group"/>
+ </component>
+ <component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="/sf/os/mm/mmapitest/devsoundexthaitest/group"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/mm/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+ <collection id="audio" name="Audio Codecs" level="middleware">
+ <component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
+ <unit bldFile="audio/arm_cmmf_codecs/group"/>
+ </component>
+ </collection>
+ <collection id="video" name="Video Codecs" level="middleware">
+ </collection>
+ <collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
+ <component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
+ <unit bldFile="devsoundextensions/drmaudioplayer/group"/>
+ <!-- following two units should be #included in above bld.inf -->
+ <!-- <unit bldFile="devsoundextensions/drmaudioplayer/drmplayserver/group"/> -->
+ <!-- <unit bldFile="devsoundextensions/drmaudioplayer/drmplayutility/group"/> -->
+ </component>
+ <component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
+ <unit bldFile="devsoundextensions/mmextfw/group"/>
+ </component>
+ <component id="audiorouting" filter="s60" name="Audio Routing">
+ <unit bldFile="devsoundextensions/audiorouting/group"/>
+ </component>
+ <component id="effects" filter="s60" name="Effects">
+ <unit bldFile="devsoundextensions/effects/group"/>
+ <!-- should test be #included in group file?-->
+ <!-- <unit bldFile="devsoundextensions/effects/effecttest"/> -->
+ </component>
+ <component id="effectspresets" filter="s60" name="Effects Presets">
+ <unit bldFile="devsoundextensions/effectspresets/group"/>
+ </component>
+ <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
+ <unit bldFile="devsoundextensions/telephonyaudiorouting/group"/>
+ <!-- should the following should be #included in the above bld.inf? -->
+ <!-- <unit bldFile="devsoundextensions/telephonyaudiorouting/server/group"/> -->
+ <!-- <unit bldFile="devsoundextensions/telephonyaudiorouting/session/group"/> -->
+ <!-- <unit bldFile="devsoundextensions/telephonyaudiorouting/telephonyaudioroutingbase/group"/> -->
+ <!-- <unit bldFile="devsoundextensions/telephonyaudiorouting/telephonyaudioroutingmanager/group"/> -->
+ </component>
+ <component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
+ <unit bldFile="devsoundextensions/mmfcustominterfaces/group"/>
+ </component>
+ <component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
+ <unit bldFile="devsoundextensions/addeddevsoundcontrol/group"/>
+ </component>
+ <component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
+ <unit bldFile="devsoundextensions/globalaudiosettings/group"/>
+ </component>
+ <component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
+ <unit bldFile="devsoundextensions/restrictedaudiooutput/group"/>
+ </component>
+ <component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
+ <unit bldFile="devsoundextensions/ciextnfactoryplugins/group"/>
+ </component>
+ </collection>
+ <collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
+ <component id="arm_mdf_postprocessor" filter="s60" name="ARM MDF Postprocessor">
+ <unit bldFile="mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
+ </component>
+ </collection>
+ <collection id="videoadaptationextensions" name="Video Adaptation Extensions" level="adaptation">
+ <component id="postingsurface" filter="s60" name="Posting Surface">
+ <unit bldFile="videoadaptationextensions/postingsurface/group"/>
+ </component>
+ </collection>
+ <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
+ <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="imagingandcamerafws/imagingfws/group" mrp="imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+ </component>
+ <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="imagingandcamerafws/imagingunittest/group"/>
+ </component>
+ <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="imagingandcamerafws/imaginginttest/group"/>
+ </component>
+ <component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
+ <unit bldFile="imagingandcamerafws/camerafw/group" mrp="imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+ </component>
+ <component id="cameraunittest" name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="imagingandcamerafws/cameraunittest/group"/>
+ </component>
+ </collection>
+ <collection id="mmlibs" name="Multimedia Libraries" level="middleware">
+ <component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+ <unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+ </component>
+ <component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="mmlibs/mmfw/group" mrp="mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmplugins" name="Multimedia Plugins" level="middleware">
+ <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="mmplugins/imagingplugins/group" mrp="mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+ </component>
+ <component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="mmplugins/cameraplugins/group" mrp="mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+ </component>
+ <component id="lib3gp" name="3GP Library" introduced="^2" purpose="optional">
+ <unit bldFile="mmplugins/lib3gp/group" mrp="mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+ </component>
+ <component id="lib3gpunittest" name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="mmplugins/lib3gpunittest/group"/>
+ </component>
+ <component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="mmplugins/mmfwplugins/group" mrp="mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+ </component>
+ </collection>
+ <collection id="mm_info" name="Multimedia Info" level="app-if">
+ <component id="mm_pub" filter="s60" name="Multimedia Public Interfaces" class="api">
+ <unit bldFile="mm_pub/group"/>
+ <!-- should #include the following from the main bld.inf -->
+ <unit bldFile="mm_pub/audio_effects_api/tsrc/group"/>
+ <unit bldFile="mm_pub/audio_effects_presets_api/tsrc/group"/>
+ <unit bldFile="mm_pub/drm_audio_player_api/tsrc/group"/>
+ </component>
+ <component id="mm_plat" filter="s60" name="Multimedia Platform Interfaces" class="api">
+ <unit bldFile="mm_plat/group"/>
+ <!-- should #include the following from the main bld.inf -->
+ <unit bldFile="mm_plat/aac_decoder_config_api/tsrc/group"/>
+ <unit bldFile="mm_plat/audio_routing_api/tsrc/group"/>
+ <unit bldFile="mm_plat/audio_visualization_api/tsrc/group"/>
+ <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/tsrc/group"/>
+ <unit bldFile="mm_plat/error_concealment_interface_api/tsrc/group"/>
+ <unit bldFile="mm_plat/g711_decoder_interface_api/tsrc/group"/>
+ <unit bldFile="mm_plat/g711_encoder_interface_api/tsrc/group"/>
+ <unit bldFile="mm_plat/g729_decoder_interface_api/tsrc/group"/>
+ <unit bldFile="mm_plat/g729_encoder_interface_api/tsrc/group"/>
+ <unit bldFile="mm_plat/global_audio_settings_api/tsrc/group"/>
+ <unit bldFile="mm_plat/ilbc_decoder_interface_api/tsrc/group"/>
+ <unit bldFile="mm_plat/ilbc_encoder_interface_api/tsrc/group"/>
+ <unit bldFile="mm_plat/ra8_decoder_interface_api/tsrc/group"/>
+ <unit bldFile="mm_plat/restricted_audio_output_api/tsrc/group"/>
+ <unit bldFile="mm_plat/sbc_encoder_interface_api/tsrc/group"/>
+ <unit bldFile="mm_plat/speech_encoder_config_api/tsrc/group"/>
+ <unit bldFile="mm_plat/wma_decoder_interface_api/tsrc/group"/>
+ </component>
+ <component id="mm_build" filter="s60" name="Multimedia Build">
+ <!-- add system include to each bld.inf mentioned and remove this -->
+ <unit bldFile="group"/>
+ </component>
+ <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
+ <unit mrp="mm_info/mmdocs/multimedia_documentation.mrp"/>
+ </component>
+ <component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="mm_info/mm_metadata/mm_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
+ <component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
+ <unit bldFile="mmresourcemgmt/mmresctrl/group" mrp="mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
+ <component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
+ <unit bldFile="mmdevicefw/mdf/group" mrp="mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+ </component>
+ <component id="mdfunittest" name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
+ <unit mrp="mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="mmdevicefw/mdfunittest/group"/>
+ </component>
+ <component id="speechrecogsupport" name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="mmdevicefw/speechrecogsupport/group" mrp="mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+ <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
+ <unit bldFile="mmswadaptation/videorenderer/group" mrp="mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
+ <component id="mmtestfw" name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="mmtestenv/mmtestfw/group"/>
+ </component>
+ <component id="mmtestfwunittest" name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="mmtestenv/mmtestfwunittest/group"/>
+ </component>
+ <component id="mmtestagent" name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
+ <unit mrp="mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="mmtestenv/mmtestagent/group"/>
+ </component>
+ <component id="mmtesttools" name="Multimedia Test Tools" purpose="development" filter="test">
+ <unit mrp="mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="mmtestenv/mmtesttools/Group"/>
+ </component>
+ </collection>
+ <collection id="omxil" name="OpenMAX IL" level="hw-if">
+ <component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
+ <unit version="1" bldFile="omxil/omxilapi/group" mrp="omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
+ </component>
+ <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
+ <unit version="1" bldFile="omxil/omxilcore/group" mrp="omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
+ </component>
+ <component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+ <unit version="1" bldFile="omxil/omxilcomponentcommon/group" mrp="omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
+ </component>
+ <component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+ <unit version="1" bldFile="omxil/omxilrefcomps/ref_components/group" mrp="omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
+ </component>
+ <component id="omxilunittest" name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
+ <unit mrp="omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="omxil/omxilunittest/group"/>
+ </component>
+ <component id="omxilcoreconftest" name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
+ <unit mrp="omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="omxil/omxilcoreconftest/group"/>
+ </component>
+ <component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+ <unit bldFile="omxil/mmilapi/group" mrp="omxil/mmilapi/group/multimedia_il_api.mrp"/>
+ </component>
+ </collection>
+ <collection id="devsound" name="Sound Device" level="devices">
+ <component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+ </component>
+ <component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
+ <unit bldFile="devsound/a3fdevsound/group" mrp="devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+ </component>
+ <component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+ <unit bldFile="devsound/a3facf/group" mrp="devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+ </component>
+ <component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+ <unit bldFile="devsound/devsoundpluginsupport/group" mrp="devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+ </component>
+ <component id="refdevsound" name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
+ <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
+ </component>
+ <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin">
+ <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+ </component>
+ <component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
+ <unit bldFile="devsound/a3ftrace/group" mrp="devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+ </component>
+ <component id="a3fintegrationtest" name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="devsound/a3fintegrationtest/group"/>
+ </component>
+ <component id="a3fsrvstart" name="A3F Server Start" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="devsound/a3fsrvstart/group" mrp="devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+ </component>
+ </collection>
+ <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+ <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
+ <unit bldFile="devsound/hwdevapi/group" mrp="devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
+ </component>
+ <component id="a3facl" name="A3F Audio Component Library" introduced="^2" purpose="development">
+ <unit bldFile="mmhais/a3facl/group" mrp="mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
+ </component>
+ <component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional">
+ <unit bldFile="mmhais/a3fdevsoundcustomisation/group" mrp="mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+ </component>
+ <component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional">
+ <unit bldFile="mmhais/refacladapt/group" mrp="mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+ </component>
+ <component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="mmhais/videohai/group" mrp="mmhais/videohai/group/multimedia_videohai.mrp"/>
+ </component>
+ <component id="dvbhreceiverhai" name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
+ <unit bldFile="mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
+ </component>
+ <component id="dvbhunittest" name="Mobile TV DVB-H Unit Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="mmhais/dvbhunittest/hai/dvbh/group"/>
+ </component>
+ </collection>
+ <collection id="mmapitest" name="Multimedia API Tests" level="app-if">
+ <component id="mmsvs" name="Multimedia Verification Suite" introduced="^2" purpose="development">
+ <unit mrp="mmapitest/mmsvs/group/mmsvs.mrp"/>
+ </component>
+ <component id="devvideohaitest" name="DevVideo HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="mmapitest/devvideohaitest/group"/>
+ </component>
+ <component id="devsoundhaitest" name="DevSound HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="mmapitest/devsoundhaitest/group"/>
+ </component>
+ <component id="devsoundexthaitest" name="DevSound Extensions HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="mmapitest/devsoundexthaitest/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/networkingsrv/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/networkingsrv/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,270 +1,249 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-<component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
-</component>
-</collection>
-<collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-<component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/dnd/group" mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-</component>
-<component name="dndconfig" long-name="DND Config" introduced="7.0" purpose="mandatory" class="config">
-<unit mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp"/>
-</component>
-<component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/dhcp/group" mrp="/sf/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-</component>
-<component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="tb91" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-</component>
-<component name="punycodeconv" long-name="Punycode Converter" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/sf/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
-</component>
-</collection>
-<collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-<component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/sf/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-</component>
-<component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
-</component>
-<component name="mbmsparameters" long-name="MBMS Parameters" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
-</component>
-</collection>
-<collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-<component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-</component>
-<component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" introduced="7.0" purpose="optional" plugin="Y">
-<unit mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp"/>
-</component>
-<component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
-</component>
-<component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" class="config">
-<unit mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" version="2"/>
-</component>
-<component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-</component>
-<component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-</component>
-</collection>
-<collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-<component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/sf/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-</component>
-</collection>
-<collection name="networkcontrol" long-name="Network Control" level="plugin">
-<component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config">
-<unit mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp"/>
-</component>
-<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/qoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-</component>
-<component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-</component>
-<component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-</component>
-<component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/sf/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
-</component>
-<component name="ipnetworklayer" long-name="IP Network Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
-</component>
-<component name="iptransportlayer" long-name="IP Transport Layer" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
-</component>
-<component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
-</component>
-<component name="ipupsplugins" long-name="IP UPS Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkcontrol/ipupsplugins/group" mrp="/sf/os/networkingsrv/networkcontrol/ipupsplugins/group/networking_ipups.mrp"/>
-</component>
-</collection>
-<collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-<component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config">
-<unit mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp"/>
-</component>
-<component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-</component>
-<component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-</component>
-<component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-</component>
-<component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/mobileip/group" mrp="/sf/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-</component>
-<component name="dnsproxy" long-name="DNS Proxy" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/sf/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
-</component>
-</collection>
-<collection name="networksecurity" long-name="Network Security" level="framework">
-<component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networksecurity/tls/group" mrp="/sf/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-</component>
-<component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
-<unit bldFile="/sf/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/sf/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-</component>
-<component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
-<unit bldFile="/sf/os/networkingsrv/networksecurity/ipsec/group" mrp="/sf/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-</component>
-</collection>
-<collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-<component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp"/>
-</component>
-<component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
-</component>
-<component name="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5" purpose="development">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp"/>
-</component>
-<component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" plugin="Y">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp"/>
-</component>
-<component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" purpose="development" plugin="Y">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp"/>
-</component>
-<component name="ipanalyzer" long-name="IP Analyzer" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp"/>
-</component>
-<component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-</component>
-<component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="tb92" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
-</component>
-</collection>
-<collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
-<component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
-<!-- production component: contains the IBY files -->
-<unit bldFile="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-</component>
-<component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-</component>
-<component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-<component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="networkingsrv">
-<unit bldFile="/sf/os/networkingsrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="commsdb" long-name="Comms DB" level="server">
+ <component name="s60_commsdb" filter="s60" long-name="S60 Commsdb" class="config">
+ <unit bldFile="/sf/os/networkingsrv/commsdb/s60_commsdb/group"/>
+ </component>
+ </collection>
+ <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
+ <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
+ </component>
+ </collection>
+ <collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
+ <component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/tcpiputils/dnd/group" mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+ </component>
+ <component name="dndconfig" long-name="DND Config" introduced="7.0" purpose="mandatory" filter="test" class="config">
+ <unit mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp" bldFile="/sf/os/networkingsrv/tcpiputils/dnd/data"/>
+ </component>
+ <component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/tcpiputils/dhcp/group" mrp="/sf/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+ </component>
+ <component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="^2" purpose="mandatory" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+ </component>
+ <component name="punycodeconv" long-name="Punycode Converter" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/sf/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+ </component>
+ </collection>
+ <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
+ <component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/sf/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+ </component>
+ <component name="genericscprparameters" long-name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+ </component>
+ <component name="mbmsparameters" long-name="MBMS Parameters" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/sf/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+ </component>
+ <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="/sf/os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp" version="2"/>
+ </component>
+ </collection>
+ <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
+ <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+ </component>
+ <component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" introduced="7.0" purpose="optional" filter="test" plugin="Y">
+ <unit mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp" bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group"/>
+ </component>
+ <component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="2"/>
+ </component>
+ <component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" filter="test" class="config">
+ <unit mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/data" version="2"/>
+ </component>
+ <component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+ </component>
+ <component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+ </component>
+ </collection>
+ <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
+ <component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development">
+ <unit bldFile="/sf/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/sf/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+ </component>
+ </collection>
+ <collection name="networkcontrol" long-name="Network Control" level="plugin">
+ <component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" filter="test" class="config">
+ <unit mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/data"/>
+ </component>
+ <component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/qoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+ </component>
+ <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+ </component>
+ <component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+ </component>
+ <component name="qosipscpr" long-name="QoS IP SCPR" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/sf/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+ </component>
+ <component name="ipnetworklayer" long-name="IP Network Layer" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/sf/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+ </component>
+ <component name="iptransportlayer" long-name="IP Transport Layer" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/sf/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+ </component>
+ <component name="commsuserpromptmgr" long-name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/sf/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+ </component>
+ </collection>
+ <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
+ <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" filter="test" class="config">
+ <unit mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp" bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/data"/>
+ </component>
+ <component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+ </component>
+ <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+ </component>
+ <component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+ </component>
+ <component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/networkprotocols/mobileip/group" mrp="/sf/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+ </component>
+ <component name="dnsproxy" long-name="DNS Proxy" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/sf/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+ </component>
+ </collection>
+ <collection name="networksecurity" long-name="Network Security" level="framework">
+ <component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/networksecurity/tls/group" mrp="/sf/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+ </component>
+ <component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory">
+ <unit bldFile="/sf/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/sf/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+ </component>
+ <component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
+ <unit bldFile="/sf/os/networkingsrv/networksecurity/ipsec/group" mrp="/sf/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+ </component>
+ </collection>
+ <collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
+ <component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="/sf/os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingunittest/group"/>
+ </component>
+ <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
+ <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
+ </component>
+ <component name="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5" purpose="development" filter="test">
+ <unit mrp="/sf/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group"/>
+ </component>
+ <component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" filter="test" plugin="Y">
+ <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/ipprobe/group"/>
+ </component>
+ <component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" purpose="development" filter="test" plugin="Y">
+ <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group"/>
+ </component>
+ <component name="ipanalyzer" long-name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="/sf/os/networkingsrv/networkingtestandutils/ipanalyzer/group"/>
+ </component>
+ <component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
+ <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+ </component>
+ <component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+ <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
+ </component>
+ </collection>
+ <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
+ <component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
+ <!-- production component: contains the IBY files -->
+ <unit bldFile="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+ </component>
+ <component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+ </component>
+ <component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
+ <component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/networkingsrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="networkingsrv" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="commsdb" name="Comms DB" level="server">
+ <component id="s60_commsdb" filter="s60" name="S60 Commsdb" class="config">
+ <unit bldFile="commsdb/s60_commsdb/group"/>
+ </component>
+ </collection>
+ <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
+ <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
+ <unit bldFile="esockapiextensions/internetsockets/group" mrp="esockapiextensions/internetsockets/group/networking_insock.mrp"/>
+ </component>
+ </collection>
+ <collection id="tcpiputils" name="TCP/IP Utilities" level="plugin">
+ <component id="dnd" name="DND" introduced="7.0" purpose="mandatory">
+ <unit bldFile="tcpiputils/dnd/group" mrp="tcpiputils/dnd/group/networking_dnd.mrp"/>
+ </component>
+ <component id="dndconfig" name="DND Config" introduced="7.0" purpose="mandatory" class="config" filter="test">
+ <unit mrp="tcpiputils/dnd/group/networking_dnd-config.mrp" bldFile="tcpiputils/dnd/data"/>
+ </component>
+ <component id="dhcp" name="DHCP" introduced="8.0" purpose="optional">
+ <unit bldFile="tcpiputils/dhcp/group" mrp="tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+ </component>
+ <component id="networkaddressandporttranslation" name="Network Address and Port Translation" introduced="^2" purpose="mandatory" class="plugin">
+ <unit bldFile="tcpiputils/networkaddressandporttranslation/group" mrp="tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+ </component>
+ <component id="punycodeconv" name="Punycode Converter" introduced="^3" purpose="mandatory">
+ <unit bldFile="tcpiputils/punycodeconv/group" mrp="tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+ </component>
+ </collection>
+ <collection id="linklayercontrol" name="Link Layer Control" level="hw-if">
+ <component id="nullagt" name="NULL AGT" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="linklayercontrol/nullagt/group" mrp="linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+ </component>
+ <component id="genericscprparameters" name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+ <unit bldFile="linklayercontrol/genericscprparameters/group" mrp="linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+ </component>
+ <component id="mbmsparameters" name="MBMS Parameters" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="linklayercontrol/mbmsparameters/group" mrp="linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+ </component>
+ <component id="networkinterfacemgr" name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+ <unit version="2" bldFile="linklayercontrol/networkinterfacemgr/group" mrp="linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
+ </component>
+ </collection>
+ <collection id="linklayerprotocols" name="Link Layer Protocols" level="hw-if">
+ <component id="ethernetnif" name="Ethernet NIF" purpose="optional" class="plugin">
+ <unit bldFile="linklayerprotocols/ethernetnif/group" mrp="linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+ </component>
+ <component id="ethernetpacketdriver" name="Ethernet Packet Driver" introduced="7.0" purpose="optional" class="plugin" filter="test">
+ <unit mrp="linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp" bldFile="linklayerprotocols/ethernetpacketdriver/group"/>
+ </component>
+ <component id="pppnif" name="PPP NIF" introduced="ER5" purpose="optional" class="plugin">
+ <unit version="2" bldFile="linklayerprotocols/pppnif/group" mrp="linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
+ </component>
+ <component id="pppconfig" name="PPP Config" introduced="ER5" purpose="optional" class="config" filter="test">
+ <unit version="2" mrp="linklayerprotocols/pppnif/group/networking_ppp-config.mrp" bldFile="linklayerprotocols/pppnif/data"/>
+ </component>
+ <component id="slipnif" name="SLIP NIF" purpose="development" class="plugin">
+ <unit bldFile="linklayerprotocols/slipnif/group" mrp="linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+ </component>
+ <component id="tunnelnif" name="Tunnel NIF" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="linklayerprotocols/tunnelnif/group" mrp="linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+ </component>
+ </collection>
+ <collection id="linklayerutils" name="Link Layer Utilities" level="hw-if">
+ <component id="packetlogger" name="Packet Logger" introduced="8.1" purpose="development">
+ <unit bldFile="linklayerutils/packetlogger/group" mrp="linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkcontrol" name="Network Control" level="plugin">
+ <component id="qosfwconfig" name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" filter="test">
+ <unit mrp="networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="networkcontrol/qosfwconfig/qos/data"/>
+ </component>
+ <component id="qoslib" name="QoS Library" introduced="7.0s" purpose="optional">
+ <unit bldFile="networkcontrol/qoslib/group" mrp="networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+ </component>
+ <component id="pfqoslib" name="PF QoS Library" introduced="7.0s" purpose="optional">
+ <unit bldFile="networkcontrol/pfqoslib/group" mrp="networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+ </component>
+ <component id="qosfwprt" name="QoS Framework PRT" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="networkcontrol/qosfwconfig/qos/group" mrp="networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+ </component>
+ <component id="qosipscpr" name="QoS IP SCPR" purpose="optional" class="plugin">
+ <unit bldFile="networkcontrol/qosipscpr/group" mrp="networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+ </component>
+ <component id="ipnetworklayer" name="IP Network Layer" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="networkcontrol/ipnetworklayer/group" mrp="networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+ </component>
+ <component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="networkcontrol/iptransportlayer/group" mrp="networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+ </component>
+ <component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="networkcontrol/commsuserpromptmgr/group" mrp="networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkprotocols" name="Network Protocols" level="plugin">
+ <component id="tcpipv4config" name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config" filter="test">
+ <unit mrp="networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp" bldFile="networkprotocols/tcpipv4v6prt/data"/>
+ </component>
+ <component id="ipeventnotifier" name="IP Event Notifier" introduced="8.1" purpose="mandatory" class="plugin">
+ <unit bldFile="networkprotocols/ipeventnotifier/group" mrp="networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+ </component>
+ <component id="tcpipv4v6prt" name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" class="plugin">
+ <unit bldFile="networkprotocols/tcpipv4v6prt/group" mrp="networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+ </component>
+ <component id="iphook" name="IP Hook" introduced="7.0" purpose="mandatory">
+ <unit bldFile="networkprotocols/iphook/inhook6/group" mrp="networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+ </component>
+ <component id="mobileip" name="Mobile IP" introduced="8.1" purpose="optional" class="plugin">
+ <unit bldFile="networkprotocols/mobileip/group" mrp="networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+ </component>
+ <component id="dnsproxy" name="DNS Proxy" introduced="^3" purpose="optional">
+ <unit bldFile="networkprotocols/dnsproxy/group" mrp="networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+ </component>
+ </collection>
+ <collection id="networksecurity" name="Network Security" level="framework">
+ <component id="tls" name="TLS" introduced="6.0" purpose="mandatory">
+ <unit bldFile="networksecurity/tls/group" mrp="networksecurity/tls/group/networking_tls.mrp"/>
+ </component>
+ <component id="tlsprovider" name="TLS Provider" introduced="8.1" purpose="mandatory">
+ <unit bldFile="networksecurity/tlsprovider/group" mrp="networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+ </component>
+ <component id="ipsec" name="IPsec" introduced="7.0" purpose="optional">
+ <unit bldFile="networksecurity/ipsec/group" mrp="networksecurity/ipsec/group/networking_ipsec.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkingtestandutils" name="Networking Test and Utils" level="app-if">
+ <component id="networkingunittest" name="Networking Unit Test" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="networkingtestandutils/networkingunittest/group/networking_unittest.mrp" bldFile="networkingtestandutils/networkingunittest/group"/>
+ </component>
+ <component id="networkingexamples" name="Networking Examples" introduced="7.0" purpose="development">
+ <unit bldFile="networkingtestandutils/networkingexamples/examplecode/group" mrp="networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
+ </component>
+ <component id="exampleinternetutilities" name="Example Internet Utilities" introduced="ER5" purpose="development" filter="test">
+ <unit mrp="networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp" bldFile="networkingtestandutils/exampleinternetutilities/group"/>
+ </component>
+ <component id="ipprobe" name="IP Probe" introduced="7.0s" purpose="development" class="plugin" filter="test">
+ <unit mrp="networkingtestandutils/ipprobe/group/networking_probe.mrp" bldFile="networkingtestandutils/ipprobe/group"/>
+ </component>
+ <component id="ipv6to4tunnel" name="IPv6 to 4 Tunnel" purpose="development" class="plugin" filter="test">
+ <unit mrp="networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp" bldFile="networkingtestandutils/ipv6to4tunnel/group"/>
+ </component>
+ <component id="ipanalyzer" name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="networkingtestandutils/ipanalyzer/group"/>
+ </component>
+ <component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development">
+ <unit bldFile="networkingtestandutils/networkingintegrationtest/Group" mrp="networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+ </component>
+ <component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+ <unit bldFile="networkingtestandutils/networkingperformancemeasurementtools/group" mrp="networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
+ </component>
+ </collection>
+ <collection id="networkingsrv_info" name="Networking Services Info" level="app-if">
+ <component id="networkingrom" name="Networking ROM" purpose="mandatory">
+ <!-- production component: contains the IBY files -->
+ <unit bldFile="networkingsrv_info/networkingrom/group" mrp="networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+ </component>
+ <component id="networkingdocs" name="Networking Documentation" purpose="development" class="doc">
+ <unit mrp="networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+ </component>
+ <component id="networkingsrv_metadata" name="Networking Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ <collection id="pppcompressionplugins" name="PPP Compression Plugins" level="plugin">
+ <component id="predictorcompression" name="Predictor Compression" introduced="6.0" purpose="optional" class="plugin">
+ <unit bldFile="pppcompressionplugins/predictorcompression/group" mrp="pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/osrndtools/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/osrndtools/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,128 +1,209 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
-<collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
-<component name="cinidata" long-name="CINI Data" purpose="development">
-<unit bldFile="/sf/os/osrndtools/testexecfw1/cinidata" mrp="/sf/os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/>
-</component>
-<component name="testexecute" long-name="Test Execute" deprecated="tb91" purpose="development">
-<unit bldFile="/sf/os/osrndtools/testexecfw1/testexecute/Group" mrp="/sf/os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
-</component>
-</collection>
-<collection name="osrndtools_info" long-name="OS R&D tools Info" level="trace">
-<component name="osrndtools_metadata" long-name="OS R&D tools Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="tools_osrndtools_osrndtools_plat_hti_api">
-<unit bldFile="/sf/os/osrndtools/osrndtools_plat/hti_api/group" mrp=""/>
-</component>
-<component name="tools_osrndtools_hti">
-<unit bldFile="/sf/os/osrndtools/hti/group" mrp=""/>
-</component>
-<component name="osrndtools">
-<unit bldFile="/sf/os/osrndtools/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="osrndtools" level="services" long-name="OS R&D tools" levels="fw trace">
+ <collection name="stif" long-name="STIF" level="fw">
+ <component name="stif_plat" filter="s60" long-name="STIF Platform Interfaces" purpose="development" class="api">
+ <unit bldFile="/sf/os/osrndtools/stif/stif_plat/group"/>
+ </component>
+ <component name="testinterface" filter="s60" long-name="Test Interface" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testinterface/group"/>
+ </component>
+ <component name="testserver" filter="s60" long-name="Test Server" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testserver/group"/>
+ </component>
+ <component name="testengine" filter="s60" long-name="Test Engine" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testengine/group"/>
+ </component>
+ <component name="testserverstarter" filter="s60" long-name="Test Server Starter" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testserverstarter/group"/>
+ </component>
+ <component name="stiftfwif" filter="s60" long-name="STIF Test Framework Interface" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/stiftfwif/group"/>
+ </component>
+ <component name="consoleui" filter="s60" long-name="Console UI" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/consoleui/group"/>
+ </component>
+ <component name="testcombiner" filter="s60" long-name="Test Combiner" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testcombiner/group"/>
+ </component>
+ <component name="demomodule" filter="s60" long-name="Demo Module" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/demomodule/group"/>
+ </component>
+ <component name="atslogger" filter="s60" long-name="ATS Logger" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/atslogger/group"/>
+ </component>
+ <component name="atsinterface" filter="s60" long-name="ATS Interface" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/atsinterface/group"/>
+ </component>
+ <component name="testscripter" filter="s60" long-name="Test Scripter" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/testscripter/group"/>
+ </component>
+ <component name="suevent" filter="s60" long-name="SU Event" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/stif/suevent/group"/>
+ </component>
+ <component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
+ <!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+ <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+ </component>
+ <component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
+ <!-- move exports into self-contained component. Remove this when configuration is in place-->
+ <unit bldFile="/sf/os/osrndtools/stif/group"/>
+ </component>
+ </collection>
+ <collection name="memspy" long-name="Memspy" level="trace">
+ <component name="memspy_plat" filter="s60" long-name="Memspy Platform Interfaces" purpose="development" class="api">
+ <unit bldFile="/sf/os/osrndtools/memspy/memspy_plat/group"/>
+ </component>
+ <component name="driver" filter="s60" long-name="Memspy Driver" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/memspy/driver/group"/>
+ </component>
+ <component name="memspy_engine" filter="s60" long-name="Memspy Engine" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/memspy/engine/group"/>
+ </component>
+ <component name="commandline" filter="s60" long-name="Memspy Command Line" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/memspy/commandline/group"/>
+ </component>
+ <component name="console" filter="s60" long-name="Memspy Console" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/memspy/console/group"/>
+ </component>
+ <component name="memspy_build" filter="s60" long-name="Memspy Build" purpose="development">
+ <!-- move exports into self-contained component.-->
+ <unit bldFile="/sf/os/osrndtools/memspy/group"/>
+ </component>
+ </collection>
+ <collection name="hti" long-name="Harmonized Test Interface" level="trace">
+ <component name="hti_plat" filter="s60" long-name="HTI Platform Interfaces" purpose="development" class="api">
+ <unit bldFile="/sf/os/osrndtools/hti/hti_plat/group"/>
+ </component>
+ <component name="hticfg" filter="s60" long-name="HTI Config" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/hti/hticfg/group"/>
+ </component>
+ <component name="htiautostart" filter="s60" long-name="HTI Autostart" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/hti/htiautostart/group"/>
+ </component>
+ <component name="htiframework" filter="s60" long-name="HTI Framework" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/hti/htiframework/group"/>
+ </component>
+ <component name="hticommplugins" filter="s60" long-name="HTI Communication Plugins" purpose="development" plugin="Y">
+ <!-- need to #include these from a single unit or separate into component at the right directory level -->
+ <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+ </component>
+ <component name="htiserviceplugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
+ <!-- need to #include these from a single unit or separate into component at the right directory level -->
+ <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+ <unit bldFile="/sf/os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+ </component>
+ <component name="htifilehlp" filter="s60" long-name="HTI File Help" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/hti/htifilehlp/group"/>
+ </component>
+ <component name="htiwatchdog" filter="s60" long-name="HTI Watchdog" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/hti/htiwatchdog/group"/>
+ </component>
+ <component name="hti_build" filter="s60" long-name="HTI Build" purpose="development">
+ <!-- move exports into self-contained component.-->
+ <unit bldFile="/sf/os/osrndtools/hti/group"/>
+ </component>
+ </collection>
+ <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
+ <component name="cinidata" long-name="CINI Data" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/testexecfw1/cinidata" mrp="/sf/os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/>
+ </component>
+ <component name="testexecute" long-name="Test Execute" deprecated="^2" purpose="development">
+ <unit bldFile="/sf/os/osrndtools/testexecfw1/testexecute/Group" mrp="/sf/os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
+ </component>
+ </collection>
+ <collection name="osrndtools_info" long-name="OS R&D tools Info" level="trace">
+ <component name="osrndtools_plat" filter="s60" long-name="OS R&D tools Platform Interfaces" purpose="development" class="api">
+ <unit bldFile="/sf/os/osrndtools/osrndtools_plat/group"/>
+ <!-- currently empty. Remove? -->
+ </component>
+ <component name="osrndtools_metadata" long-name="OS R&D tools Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/osrndtools/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="osrndtools" name="OS R&D tools" levels="fw trace">
+ <collection id="stif" name="STIF" level="fw">
+ <component id="testinterface" filter="s60" name="Test Interface" purpose="development">
+ <unit bldFile="stif/testinterface/group"/>
+ </component>
+ <component id="testserver" filter="s60" name="Test Server" purpose="development">
+ <unit bldFile="stif/testserver/group"/>
+ </component>
+ <component id="testengine" filter="s60" name="Test Engine" purpose="development">
+ <unit bldFile="stif/testengine/group"/>
+ </component>
+ <component id="testserverstarter" filter="s60" name="Test Server Starter" purpose="development">
+ <unit bldFile="stif/testserverstarter/group"/>
+ </component>
+ <component id="stiftfwif" filter="s60" name="STIF Test Framework Interface" purpose="development">
+ <unit bldFile="stif/stiftfwif/group"/>
+ </component>
+ <component id="consoleui" filter="s60" name="Console UI" purpose="development">
+ <unit bldFile="stif/consoleui/group"/>
+ </component>
+ <component id="testcombiner" filter="s60" name="Test Combiner" purpose="development">
+ <unit bldFile="stif/testcombiner/group"/>
+ </component>
+ <component id="demomodule" filter="s60" name="Demo Module" purpose="development">
+ <unit bldFile="stif/demomodule/group"/>
+ </component>
+ <component id="atslogger" filter="s60" name="ATS Logger" purpose="development">
+ <unit bldFile="stif/atslogger/group"/>
+ </component>
+ <component id="atsinterface" filter="s60" name="ATS Interface" purpose="development">
+ <unit bldFile="stif/atsinterface/group"/>
+ </component>
+ <component id="testscripter" filter="s60" name="Test Scripter" purpose="development">
+ <unit bldFile="stif/testscripter/group"/>
+ </component>
+ <component id="suevent" filter="s60" name="SU Event" purpose="development">
+ <unit bldFile="stif/suevent/group"/>
+ </component>
+ <component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
+ <unit bldFile="stif/stifkerneltestclassbase/group"/>
+ </component>
+ <component id="examples" filter="s60" name="STIF Examples" purpose="development">
+ <!-- <unit bldFile="stif/examples/stiftestmeasurementstub/group"/> -->
+ <!-- <unit bldFile="stif/examples/stifhwresetstub/group"/> -->
+ </component>
+ <component id="testmoduletemplates" filter="s60" name="Test Module Templates" purpose="development">
+ <!-- <unit bldFile="stif/testmoduletemplates/templatescriptxxx/group"/> -->
+ <!-- <unit bldFile="stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
+ <!-- <unit bldFile="stif/testmoduletemplates/capsmodifierxxx/group"/> -->
+ <!-- <unit bldFile="stif/testmoduletemplates/testmodulexxx/group"/> -->
+ <!-- <unit bldFile="stif/testmoduletemplates/stifunitxxx/group"/> -->
+ <!-- <unit bldFile="stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
+ </component>
+ <component id="stif_build" filter="s60" name="STIF Build" purpose="development">
+ <unit bldFile="stif/group"/>
+ </component>
+ </collection>
+ <collection id="memspy" name="Memspy" level="trace">
+ <component id="driver" filter="s60" name="Memspy Driver" purpose="development">
+ <unit bldFile="memspy/driver/group"/>
+ </component>
+ <component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
+ <unit bldFile="memspy/engine/group"/>
+ </component>
+ <component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
+ <unit bldFile="memspy/commandline/group"/>
+ </component>
+ <component id="console" filter="s60" name="Memspy Console" purpose="development">
+ <unit bldFile="memspy/console/group"/>
+ </component>
+ <component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+ <unit bldFile="memspy/group"/>
+ </component>
+ </collection>
+ <collection id="hti" name="Harmonized Test Interface" level="trace">
+ <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
+ <unit bldFile="hti/htiframework/group"/>
+ </component>
+ <component id="hticfg" filter="s60" name="HTI Config" purpose="development">
+ <unit bldFile="hti/hticfg/group"/>
+ </component>
+ <component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
+ <unit bldFile="hti/htiautostart/group"/>
+ </component>
+ <component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
+ <unit bldFile="hti/htifilehlp/group"/>
+ </component>
+ <component id="htiwatchdog" filter="s60" name="HTI Watchdog" purpose="development">
+ <unit bldFile="hti/htiwatchdog/group"/>
+ </component>
+ <component id="hti_build" filter="s60" name="HTI Build" purpose="development">
+ <unit bldFile="hti/group"/>
+ </component>
+ </collection>
+ <collection id="testexecfw1" name="Test Execution Framework v1" level="fw">
+ <component id="cinidata" name="CINI Data" purpose="development">
+ <unit bldFile="testexecfw1/cinidata" mrp="testexecfw1/cinidata/tools_cinidata.mrp"/>
+ </component>
+ <component id="testexecute" name="Test Execute" deprecated="^2" purpose="development">
+ <unit bldFile="testexecfw1/testexecute/Group" mrp="testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
+ </component>
+ </collection>
+ <collection id="osrndtools_info" name="OS R&D tools Info" level="trace">
+ <component id="osrndtools_plat" filter="s60" name="OS R&D tools Platform Interfaces" class="api" purpose="development">
+ <unit bldFile="osrndtools_plat/group"/>
+ <!-- need to #include the next bld.inf in the above one -->
+ <unit bldFile="osrndtools_plat/hti_api/group"/>
+ </component>
+ <component id="osrndtools_metadata" name="OS R&D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/ossrv/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/ossrv/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,172 +1,213 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-<collection name="genericservices" long-name="Generic Services" level="utilities">
-<component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="/sf/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
-</component>
-<component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/genericservices/mimerecognitionfw/group" mrp="/sf/os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-</component>
-<component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/genericservices/systemagent/group" mrp="/sf/os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-</component>
-<component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericservices/taskscheduler/group" mrp="/sf/os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-</component>
-<component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericservices/activebackupclient/group" mrp="/sf/os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-</component>
-<component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-</component>
-<component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericservices/httputils/group" mrp="/sf/os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-</component>
-</collection>
-<collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
-<component name="syslibssvs" long-name="Syslibs Verfication Suite" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/ossrv/syslibsapitest/syslibssvs/group/syslibssvs.mrp"/>
-</component>
-</collection>
-<collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-<component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/compressionlibs/ziplib/group" mrp="/sf/os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-</component>
-</collection>
-<collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-<component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericopenlibs/cstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-</component>
-<component name="cppstdlib" long-name="C++ Standard Library" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/genericopenlibs/cppstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-</component>
-<component name="openenvcore" long-name="Open Environment Core" introduced="tb91" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/genericopenlibs/openenvcore/group" mrp="/sf/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-</component>
-<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="/sf/os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-</component>
-</collection>
-<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
-</component>
-<component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/lowlevellibsandfws/apputils/group" mrp="/sf/os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-</component>
-<component name="genericusabilitylib" long-name="Generic Usability Library" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="/sf/os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-</component>
-</collection>
-<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-<component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="ossrv">
-<unit bldFile="/sf/os/ossrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+ <collection name="stdlibs" long-name="Standard Libraries" level="translation">
+ <component name="libz" filter="s60" long-name="Z Compression Library">
+ <unit bldFile="/sf/os/ossrv/stdlibs/libz/group"/>
+ </component>
+ <component name="libcrypt" filter="s60" long-name="Crypt Library">
+ <unit bldFile="/sf/os/ossrv/stdlibs/libcrypt/group"/>
+ </component>
+ </collection>
+ <collection name="ssl" long-name="SSL" level="data-services">
+ <component name="libcrypto" filter="s60" long-name="Crypto Library">
+ <unit bldFile="/sf/os/ossrv/ssl/libcrypto/group"/>
+ </component>
+ <component name="libssl" filter="s60" purpose="development" long-name="SSL Library">
+ <unit bldFile="/sf/os/ossrv/ssl/libssl/group"/>
+ </component>
+ </collection>
+ <collection name="glib" long-name="GLib" level="utilities">
+ <component name="glibbackend" filter="s60" long-name="GLib Backend">
+ <unit bldFile="/sf/os/ossrv/glib/glibbackend/group"/>
+ </component>
+ <component name="libglib" filter="s60" long-name="GLib Library">
+ <unit bldFile="/sf/os/ossrv/glib/libglib/group"/>
+ </component>
+ <component name="libgthread" filter="s60" long-name="Libg Thread">
+ <unit bldFile="/sf/os/ossrv/glib/libgthread/group"/>
+ </component>
+ <component name="libgmodule" filter="s60" long-name="Libg Module">
+ <unit bldFile="/sf/os/ossrv/glib/libgmodule/group"/>
+ </component>
+ <component name="libgobject" filter="s60" long-name="Libg Object">
+ <unit bldFile="/sf/os/ossrv/glib/libgobject/group"/>
+ </component>
+ </collection>
+ <collection name="stdcpp" long-name="C++ Standard Library" level="translation">
+ <!-- collection is really a component. Needs to be moved down a directory -->
+ <component name="stdcpp_build" filter="s60" long-name="Stdcpp">
+ <unit bldFile="/sf/os/ossrv/stdcpp/group"/>
+ </component>
+ </collection>
+ <collection name="ofdbus" long-name="Open Foundation D-Bus" level="utilities">
+ <component name="dbus" filter="s60" long-name="D-Bus">
+ <unit bldFile="/sf/os/ossrv/ofdbus/dbus/group"/>
+ </component>
+ <component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
+ <unit bldFile="/sf/os/ossrv/ofdbus/dbus-glib/group"/>
+ </component>
+ <component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
+ <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+ Consider moving IBY file to one of the above as well and removing this component entirely -->
+ <unit bldFile="/sf/os/ossrv/ofdbus/group"/>
+ </component>
+ </collection>
+ <collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
+ <component name="libutils" filter="s60" long-name="Utility Library">
+ <unit bldFile="/sf/os/ossrv/utilitylibraries/libutils/group"/>
+ </component>
+ </collection>
+ <collection name="genericservices" long-name="Generic Services" level="utilities">
+ <component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="/sf/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp" version="tb101sf"/>
+ </component>
+ <component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/genericservices/mimerecognitionfw/group" mrp="/sf/os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+ </component>
+ <component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/genericservices/systemagent/group" mrp="/sf/os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+ </component>
+ <component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericservices/taskscheduler/group" mrp="/sf/os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+ </component>
+ <component name="activebackupclient" long-name="Active Backup Client" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericservices/activebackupclient/group" mrp="/sf/os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+ </component>
+ <component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+ </component>
+ <component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericservices/httputils/group" mrp="/sf/os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+ </component>
+ </collection>
+ <collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
+ <component name="syslibssvs" long-name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/ossrv/syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="/sf/os/ossrv/syslibsapitest/syslibssvs/group"/>
+ </component>
+ </collection>
+ <collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
+ <component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/compressionlibs/ziplib/group" mrp="/sf/os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+ </component>
+ </collection>
+ <collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
+ <component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericopenlibs/cstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+ </component>
+ <component name="cppstdlib" long-name="C++ Standard Library" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/genericopenlibs/cppstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+ </component>
+ <component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/genericopenlibs/openenvcore/group" mrp="/sf/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+ </component>
+ <component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="/sf/os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+ </component>
+ </collection>
+ <collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
+ <component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp" version="3"/>
+ </component>
+ <component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/apputils/group" mrp="/sf/os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+ </component>
+ <component name="genericusabilitylib" long-name="Generic Usability Library" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="/sf/os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+ </component>
+ </collection>
+ <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
+ <component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
+ <!-- exports should be moved to individual components -->
+ <unit bldFile="/sf/os/ossrv/group"/>
+ </component>
+ <component name="ossrv_plat" filter="s60" long-name="Generic OS Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/ossrv/ossrv_plat/libutils/group"/>
+ </component>
+ <component name="ossrv_pub" filter="s60" long-name="Generic OS Services Public Interfaces" class="api">
+ <unit bldFile="/sf/os/ossrv/ossrv_pub/group"/>
+ </component>
+ <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/ossrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="ossrv" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+ <collection id="utilitylibraries" name="Utility Libraries" level="encoding">
+ <component id="libutils" filter="s60" name="Utility Library">
+ <!-- this can only have one unit. Should include secondary from the main bld.inf -->
+ <unit bldFile="utilitylibraries/libutils/group"/>
+ <unit bldFile="utilitylibraries/libutils/tsrc/group"/>
+ <!-- <unit bldFile="utilitylibraries/libutils/tsrc/nft/group"/> -->
+ </component>
+ </collection>
+ <collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
+ <component id="dbus" filter="s60" name="D-Bus">
+ <unit bldFile="ofdbus/dbus/group"/>
+ <!-- this can only have one unit. Should include test from the main bld.inf -->
+ <unit bldFile="ofdbus/dbus/tsrc/group"/>
+ </component>
+ <component id="dbus-glib" filter="s60" name="D-Bus GLib">
+ <unit bldFile="ofdbus/dbus-glib/group"/>
+ <!-- this can only have one unit. Should include test from the main bld.inf -->
+ <unit bldFile="ofdbus/dbus-glib/tsrc/group"/>
+ </component>
+ <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
+ <!-- Contains IBY for for dbus. should remove #includes to above components. Consider moving IBY file to one of the above as well and removing this component entirely -->
+ <unit bldFile="ofdbus/group"/>
+ </component>
+ <component id="ofdbus_test" filter="s60" purpose="development" name="OF Dbus Test">
+ <!-- can these be put into ofdbus component? -->
+ <!-- <unit bldFile="ofdbus/tsrc/nft/idle_daemon_run/group"/> -->
+ <!-- <unit bldFile="ofdbus/tsrc/nft/g_n_messages/group"/> -->
+ <!-- <unit bldFile="ofdbus/tsrc/nft/g_file_send/group"/> -->
+ <!-- <unit bldFile="ofdbus/tsrc/nft/send_messages1/group"/> -->
+ <!-- <unit bldFile="ofdbus/tsrc/nft/stif_glib_1_simple_message/group"/> -->
+ <!-- <unit bldFile="ofdbus/tsrc/nft/file_transfer_time/group"/> -->
+ <!-- <unit bldFile="ofdbus/tsrc/nft/g_n_messages1/group"/> -->
+ <!-- <unit bldFile="ofdbus/tsrc/nft/send_messages/group"/> -->
+ </component>
+ </collection>
+ <collection id="glib" name="GLib" level="utilities">
+ <component id="glibbackend" filter="s60" name="GLib Backend">
+ <unit bldFile="glib/glibbackend/group"/>
+ </component>
+ <component id="libglib" filter="s60" name="GLib Library">
+ <unit bldFile="glib/libglib/group"/>
+ </component>
+ <component id="libgthread" filter="s60" name="Libg Thread">
+ <unit bldFile="glib/libgthread/group"/>
+ </component>
+ <component id="libgmodule" filter="s60" name="Libg Module">
+ <unit bldFile="glib/libgmodule/group"/>
+ </component>
+ <component id="libgobject" filter="s60" name="Libg Object">
+ <unit bldFile="glib/libgobject/group"/>
+ </component>
+ <component id="glib_test" filter="s60" purpose="development" name="GLib Test">
+ <unit bldFile="glib/tsrc/group"/>
+ <!-- should #include the next unit in the above bld.inf if it's needed -->
+ <!-- <unit bldFile="glib/tsrc/bc/group"/> -->
+ </component>
+ </collection>
+ <collection id="ssl" name="SSL" level="data-services">
+ <component id="libcrypto" filter="s60" name="Crypto Library">
+ <unit bldFile="ssl/libcrypto/group"/>
+ </component>
+ <component id="ssl_test" filter="s60" purpose="development" name="SSL Test">
+ <unit bldFile="ssl/tsrc/group"/>
+ <!-- should #include the next unit in the above bld.inf if it's needed -->
+ <!-- <unit bldFile="ssl/tsrc/bc/group"/> -->
+ </component>
+ </collection>
+ <collection id="stdcpp" name="C++ Standard Library" level="translation">
+ <component id="stdcpp_build" filter="s60" name="Stdcpp">
+ <unit bldFile="stdcpp/group"/>
+ </component>
+ <component id="stdcpp_test" filter="s60" purpose="development" name="Stdcpp Test">
+ <unit bldFile="stdcpp/tsrc/group"/>
+ <!-- these should be #included in the above bld.inf if they're needed -->
+ <!-- <unit bldFile="stdcpp/tsrc/stdcpp_test/tstdcpp/twsd_manual/group"/> -->
+ <!-- <unit bldFile="stdcpp/tsrc/stdcpp_test/tstdcpp/ood_manual/group"/> -->
+ <!-- <unit bldFile="stdcpp/tsrc/stdcpp_test/stlport/manual/group"/> -->
+ <!-- <unit bldFile="stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
+ <!-- <unit bldFile="stdcpp/tsrc/stdcpp_test/tstdcpp/io_manual/group"/> -->
+ <!-- <unit bldFile="stdcpp/tsrc/bc/group"/> -->
+ <!-- <unit bldFile="stdcpp/tsrc/boost_test/graph/manual/group"/> -->
+ <!-- <unit bldFile="stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
+ </component>
+ </collection>
+ <collection id="stdlibs" name="Standard Libraries" level="translation">
+ <component id="libz" filter="s60" name="Z Compression Library">
+ <unit bldFile="stdlibs/libz/group"/>
+ </component>
+ <component id="libcrypt" filter="s60" name="Crypt Library">
+ <unit bldFile="stdlibs/libcrypt/group"/>
+ </component>
+ </collection>
+ <collection id="genericservices" name="Generic Services" level="utilities">
+ <component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
+ <unit version="tb101sf" bldFile="genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
+ </component>
+ <component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
+ <unit bldFile="genericservices/mimerecognitionfw/group" mrp="genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+ </component>
+ <component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
+ <unit bldFile="genericservices/systemagent/group" mrp="genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+ </component>
+ <component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
+ <unit bldFile="genericservices/taskscheduler/group" mrp="genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+ </component>
+ <component id="activebackupclient" name="Active Backup Client" purpose="optional">
+ <unit bldFile="genericservices/activebackupclient/group" mrp="genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+ </component>
+ <component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
+ <unit mrp="genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+ </component>
+ <component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+ <unit bldFile="genericservices/httputils/group" mrp="genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+ </component>
+ </collection>
+ <collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
+ <component id="syslibssvs" name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="syslibsapitest/syslibssvs/group"/>
+ </component>
+ </collection>
+ <collection id="compressionlibs" name="Compression Libraries" level="data-services">
+ <component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+ <unit bldFile="compressionlibs/ziplib/group" mrp="compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+ </component>
+ </collection>
+ <collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
+ <component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
+ <unit bldFile="genericopenlibs/cstdlib/group" mrp="genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+ </component>
+ <component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
+ <unit bldFile="genericopenlibs/cppstdlib/group" mrp="genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+ </component>
+ <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
+ <unit bldFile="genericopenlibs/openenvcore/group" mrp="genericopenlibs/openenvcore/group/openenv.mrp"/>
+ </component>
+ <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+ <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+ </component>
+ </collection>
+ <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
+ <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
+ <unit version="3" bldFile="lowlevellibsandfws/pluginfw/Group" mrp="lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
+ </component>
+ <component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
+ <unit bldFile="lowlevellibsandfws/apputils/group" mrp="lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+ </component>
+ <component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
+ <unit bldFile="lowlevellibsandfws/genericusabilitylib/group" mrp="lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+ </component>
+ </collection>
+ <collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
+ <component id="ossrv_test" filter="s60" purpose="development" name="Generic OS Services Test">
+ <!-- is this needed? Can it be split up into tests for the individual packages? -->
+ <!-- <unit bldFile="tsrc/group"/> -->
+ </component>
+ <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
+ <!-- exports should be moved to individual components -->
+ <unit bldFile="group"/>
+ </component>
+ <component id="ossrv_plat" filter="s60" name="Generic OS Services Platform Interfaces" class="api">
+ <unit bldFile="ossrv_plat/libutils/group"/>
+ </component>
+ <component id="ossrv_pub" filter="s60" name="Generic OS Services Public Interfaces" class="api">
+ <unit bldFile="ossrv_pub/group"/>
+ <!-- <unit bldFile="ossrv_pub/boost_apis/tsrc/group"/> -->
+ <!-- <unit bldFile="ossrv_pub/glib_arrays/tsrc/group"/> -->
+ <!-- <unit bldFile="ossrv_pub/ssl_general_api/tsrc/group"/> -->
+ <!-- <unit bldFile="ossrv_pub/stl/tsrc/group"/> -->
+ </component>
+ <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/persistentdata/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/persistentdata/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,153 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="featuremgmt" long-name="Feature Management" level="framework">
-<component name="featuremgr" long-name="Feature Manager" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/persistentdata/featuremgmt/featuremgr/group" mrp="/sf/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
-</component>
-<component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/persistentdata/featuremgmt/featureregistry/group" mrp="/sf/os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-</component>
-</collection>
-<collection name="loggingservices" long-name="Logging Services" level="server">
-<component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/loggingservices/eventlogger/group" mrp="/sf/os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
-</component>
-<component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/loggingservices/filelogger/group" mrp="/sf/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
-</component>
-<component name="rfilelogger" long-name="RFile Logger" deprecated="tb92" introduced="9.1" purpose="development">
-<unit bldFile="/sf/os/persistentdata/loggingservices/rfilelogger/group" mrp="/sf/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-</component>
-</collection>
-<collection name="traceservices" long-name="Trace Services" level="server">
-<component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/traceservices/commsdebugutility/group" mrp="/sf/os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-</component>
-<component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
-<unit bldFile="/sf/os/persistentdata/traceservices/tracefw/ulogger/group" mrp="/sf/os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-</component>
-</collection>
-<collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-<component name="store" long-name="Store" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/persistentstorage/store/group" mrp="/sf/os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-</component>
-<component name="dbms" long-name="DBMS" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/persistentstorage/dbms/group" mrp="/sf/os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-</component>
-<component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/os/persistentdata/persistentstorage/centralrepository/group" mrp="/sf/os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-</component>
-<component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/persistentstorage/sql/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-</component>
-<component name="sqlite3api" long-name="SQLite 3 API" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
-</component>
-</collection>
-<collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-<component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="featuremgmt" long-name="Feature Management" level="framework">
+ <component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/persistentdata/featuremgmt/featuremgr/group" mrp="/sf/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
+ </component>
+ <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/persistentdata/featuremgmt/featureregistry/group" mrp="/sf/os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+ </component>
+ </collection>
+ <collection name="loggingservices" long-name="Logging Services" level="server">
+ <component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/loggingservices/eventlogger/group" mrp="/sf/os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
+ </component>
+ <component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/loggingservices/filelogger/group" mrp="/sf/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+ </component>
+ <component name="rfilelogger" long-name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
+ <unit bldFile="/sf/os/persistentdata/loggingservices/rfilelogger/group" mrp="/sf/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+ </component>
+ </collection>
+ <collection name="traceservices" long-name="Trace Services" level="server">
+ <component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/traceservices/commsdebugutility/group" mrp="/sf/os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+ </component>
+ <component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development">
+ <unit bldFile="/sf/os/persistentdata/traceservices/tracefw/ulogger/group" mrp="/sf/os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+ </component>
+ </collection>
+ <collection name="persistentstorage" long-name="Persistent Storage" level="framework">
+ <component name="store" long-name="Store" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/persistentstorage/store/group" mrp="/sf/os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+ </component>
+ <component name="dbms" long-name="DBMS" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/persistentstorage/dbms/group" mrp="/sf/os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+ </component>
+ <component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="/sf/os/persistentdata/persistentstorage/centralrepository/group" mrp="/sf/os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+ </component>
+ <component name="sql" long-name="SQL" introduced="9.3" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/persistentstorage/sql/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+ </component>
+ <component name="sqlite3api" long-name="SQLite 3 API" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+ </component>
+ </collection>
+ <collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
+ <component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/persistentdata/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="persistentdata" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="featuremgmt" name="Feature Management" level="framework">
+ <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
+ <unit bldFile="featuremgmt/featuremgr/group" mrp="featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
+ </component>
+ <component id="featureregistry" name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
+ <unit bldFile="featuremgmt/featureregistry/group" mrp="featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+ </component>
+ </collection>
+ <collection id="loggingservices" name="Logging Services" level="server">
+ <component id="eventlogger" name="Event Logger" introduced="6.0" purpose="optional">
+ <unit bldFile="loggingservices/eventlogger/group" mrp="loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
+ </component>
+ <component id="filelogger" name="File Logger" introduced="ER5" purpose="optional">
+ <unit bldFile="loggingservices/filelogger/group" mrp="loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+ </component>
+ <component id="rfilelogger" name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
+ <unit bldFile="loggingservices/rfilelogger/group" mrp="loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+ </component>
+ </collection>
+ <collection id="traceservices" name="Trace Services" level="server">
+ <component id="commsdebugutility" name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+ <unit bldFile="traceservices/commsdebugutility/group" mrp="traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+ </component>
+ <component id="tracefw" name="Trace Framework" introduced="9.2" purpose="development">
+ <unit bldFile="traceservices/tracefw/ulogger/group" mrp="traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+ </component>
+ </collection>
+ <collection id="persistentstorage" name="Persistent Storage" level="framework">
+ <component id="store" name="Store" purpose="optional">
+ <unit bldFile="persistentstorage/store/group" mrp="persistentstorage/store/group/syslibs_store.mrp"/>
+ </component>
+ <component id="dbms" name="DBMS" purpose="optional">
+ <unit bldFile="persistentstorage/dbms/group" mrp="persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+ </component>
+ <component id="centralrepository" name="Central Repository" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="persistentstorage/centralrepository/group" mrp="persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+ </component>
+ <component id="sql" name="SQL" introduced="9.3" purpose="optional">
+ <unit bldFile="persistentstorage/sql/GROUP" mrp="persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+ </component>
+ <component id="sqlite3api" name="SQLite 3 API" introduced="^3" purpose="optional">
+ <unit bldFile="persistentstorage/sqlite3api/GROUP" mrp="persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+ </component>
+ </collection>
+ <collection id="persistentdata_info" name="Persistent Data Services Info" level="app-if">
+ <component id="persistentdata_metadata" name="Persistent Data Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/security/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/security/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,179 +1,165 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/security/authorisation/userpromptservice/group" mrp="/sf/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/security/authorisation/userpromptutils/group" mrp="/sf/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="/sf/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/sf/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
-<unit bldFile="/sf/os/security/contentmgmt/cafrecogniserconfig" mrp="/sf/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
-</component>
-<component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
-<unit bldFile="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
-</component>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/security/crypto/weakcryptospi/group" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/security/crypto/weakcryptospi/strong" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptomgmtlibs/securityutils/group" mrp="/sf/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitytestfw" long-name="Security Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="/sf/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/sf/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/os/security/securityanddataprivacytools/securityconfig/group" mrp="/sf/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="tb92" purpose="optional" class="PC">
-<unit bldFile="/sf/os/security/securityanddataprivacytools/securitytools/group" mrp="/sf/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/security/cryptoplugins/cryptospiplugins/group" mrp="/sf/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/sf/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptoservices/asnpkcs/group" mrp="/sf/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+ <collection name="authenticationservices" long-name="Authentication Services" level="utilities">
+ <component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/authenticationservices/authenticationserver/group" mrp="/sf/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+ </component>
+ </collection>
+ <collection name="authorisation" long-name="Authorisation" level="utilities">
+ <component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/security/authorisation/userpromptservice/group" mrp="/sf/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
+ </component>
+ <component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/authorisation/userpromptutils/group" mrp="/sf/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+ </component>
+ </collection>
+ <collection name="contentmgmt" long-name="Content Management" level="utilities">
+ <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+ <unit bldFile="/sf/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/sf/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+ </component>
+ <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
+ <unit bldFile="/sf/os/security/contentmgmt/cafrecogniserconfig" mrp="/sf/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
+ </component>
+ <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
+ <unit bldFile="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+ </component>
+ </collection>
+ <collection name="crypto" long-name="Crypto Libraries" level="libraries">
+ <component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/crypto/weakcryptospi/group" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+ </component>
+ <component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/crypto/weakcryptospi/strong" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+ </component>
+ </collection>
+ <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
+ <component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptomgmtlibs/securityutils/group" mrp="/sf/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+ </component>
+ <component name="securitytestfw" long-name="Security Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="/sf/os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp" bldFile="/sf/os/security/cryptomgmtlibs/securitytestfw/group"/>
+ </component>
+ <component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+ </component>
+ <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+ </component>
+ <component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
+ <unit bldFile="/sf/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/sf/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+ </component>
+ </collection>
+ <collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
+ <component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
+ <unit bldFile="/sf/os/security/securityanddataprivacytools/securityconfig/group" mrp="/sf/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+ </component>
+ <component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
+ <unit bldFile="/sf/os/security/securityanddataprivacytools/securitytools/group" mrp="/sf/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+ </component>
+ </collection>
+ <collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
+ <component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/security/cryptoplugins/cryptospiplugins/group" mrp="/sf/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+ </component>
+ </collection>
+ <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
+ <component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/sf/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+ </component>
+ <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+ </component>
+ <component name="Browser Root Certificates" introduced="^2" purpose="optional" filter="s60">
+ <!-- not really s60 -->
+ <unit mrp="/sf/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+ </component>
+ <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptoservices/asnpkcs/group" mrp="/sf/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+ </component>
+ </collection>
+ <collection name="security_info" long-name="OS Security Info" level="utilities">
+ <component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/security/security_info/security_metadata/security_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/security/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="security" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+ <collection id="authenticationservices" name="Authentication Services" level="utilities">
+ <component id="authenticationserver" name="Authentication Server" introduced="^3" purpose="optional">
+ <unit bldFile="authenticationservices/authenticationserver/group" mrp="authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+ </component>
+ </collection>
+ <collection id="authorisation" name="Authorisation" level="utilities">
+ <component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
+ <unit bldFile="authorisation/userpromptservice/group" mrp="authorisation/userpromptservice/group/security_ups.mrp"/>
+ </component>
+ <component id="userpromptutils" name="User Prompt Utils" introduced="^3" purpose="optional">
+ <unit bldFile="authorisation/userpromptutils/group" mrp="authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+ </component>
+ </collection>
+ <collection id="contentmgmt" name="Content Management" level="utilities">
+ <component id="contentaccessfwfordrm" name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+ <unit bldFile="contentmgmt/contentaccessfwfordrm/group" mrp="contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+ </component>
+ <component id="cafrecogniserconfig" name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
+ <unit bldFile="contentmgmt/cafrecogniserconfig" mrp="contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
+ </component>
+ <component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development">
+ <unit bldFile="contentmgmt/referencedrmagent/RefTestAgent/group" mrp="contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+ </component>
+ </collection>
+ <collection id="crypto" name="Crypto Libraries" level="libraries">
+ <component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+ <unit bldFile="crypto/weakcryptospi/group" mrp="crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+ </component>
+ <component id="strongcryptospi" name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+ <unit bldFile="crypto/weakcryptospi/strong" mrp="crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+ </component>
+ </collection>
+ <collection id="cryptomgmtlibs" name="Crypto Management Libraries" level="management">
+ <component id="securityutils" name="Security Utils" introduced="8.0" purpose="optional">
+ <unit bldFile="cryptomgmtlibs/securityutils/group" mrp="cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+ </component>
+ <component id="securitytestfw" name="Security Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="cryptomgmtlibs/securitytestfw/group/security_testframework.mrp" bldFile="cryptomgmtlibs/securitytestfw/group"/>
+ </component>
+ <component id="securitydocs" name="Security Documentation" purpose="development" class="doc">
+ <unit mrp="cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+ </component>
+ <component id="cryptotokenfw" name="Crypto Token Framework" introduced="7.0" purpose="optional">
+ <unit bldFile="cryptomgmtlibs/cryptotokenfw/group" mrp="cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+ </component>
+ <component id="securitycommonutils" name="Security Common Utils" introduced="8.0" purpose="mandatory">
+ <unit bldFile="cryptomgmtlibs/securitycommonutils/group" mrp="cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+ </component>
+ </collection>
+ <collection id="securityanddataprivacytools" name="Security and Data Privacy Tools" level="services">
+ <component id="securityconfig" name="Security Config" introduced="9.1" purpose="optional">
+ <unit bldFile="securityanddataprivacytools/securityconfig/group" mrp="securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+ </component>
+ <component id="securitytools" name="Security Tools" introduced="^3" purpose="optional" target="desktop">
+ <unit bldFile="securityanddataprivacytools/securitytools/group" mrp="securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+ </component>
+ </collection>
+ <collection id="cryptoplugins" name="Crypto Plugins" level="plugins">
+ <component id="cryptospiplugins" name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="cryptoplugins/cryptospiplugins/group" mrp="cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+ </component>
+ </collection>
+ <collection id="cryptoservices" name="Crypto Services" level="plugins">
+ <component id="certificateandkeymgmt" name="Certificate and Key Management" introduced="6.0" purpose="optional">
+ <unit bldFile="cryptoservices/certificateandkeymgmt/group" mrp="cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+ </component>
+ <component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+ <unit bldFile="cryptoservices/filebasedcertificateandkeystores/group" mrp="cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+ </component>
+ <component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
+ <unit bldFile="cryptoservices/asnpkcs/group" mrp="cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+ </component>
+ </collection>
+ <collection id="security_info" name="OS Security Info" level="utilities">
+ <component id="security_metadata" name="OS Security Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="security_info/security_metadata/security_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/textandloc/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/textandloc/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,177 +1,171 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
-<unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/textandloc/charconvfw/charconvplugins/group" mrp="/sf/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-</component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-</component>
-</collection>
-<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-<component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/textandloc/fontservices/textshaperplugin/group" mrp="/sf/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-</component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
-<unit bldFile="/sf/os/textandloc/fontservices/fontstore/group" mrp="/sf/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-</component>
-<component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
-<!-- placeholder for text code from GDI -->
-</component>
-<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/sf/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-</component>
-<component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-</component>
-</collection>
-<collection name="textlayout" long-name="Text Layout" level="text">
-<component name="texthandling" long-name="Text Handling" purpose="optional">
-<unit bldFile="/sf/os/textandloc/textrendering/texthandling/group" mrp="/sf/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-</component>
-<component name="textformatting" long-name="Text Formatting" purpose="optional">
-<unit bldFile="/sf/os/textandloc/textrendering/textformatting/group" mrp="/sf/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-</component>
-<component name="word" long-name="Word" purpose="development">
-<unit mrp="/sf/os/textandloc/textrendering/word/group/app-framework_word.mrp"/>
-</component>
-</collection>
-<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="tb91" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-<component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/textandloc/textrendering/numberformatting/group" mrp="/sf/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-</component>
-</collection>
-<collection name="localesupport" long-name="Locale Support" level="util">
-<component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/kernelhwsrv/localisation/localesupport" mrp="/sf/os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-</component>
-<component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
-</component>
-</collection>
-<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-<component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-<!-- placeholder for split from GDI Tools -->
-</component>
-<component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-<unit bldFile="/sf/os/graphics/graphicstools/bitmapfonttools/group" mrp="/sf/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-</component>
-</collection>
-<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="textandloc">
-<unit bldFile="/sf/os/textandloc/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
+ <collection name="charconvfw" long-name="Character Conversion" level="encoding">
+ <component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
+ <unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+ </component>
+ <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/textandloc/charconvfw/charconvplugins/group" mrp="/sf/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+ </component>
+ <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+ </component>
+ </collection>
+ <collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
+ <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/textandloc/fontservices/textshaperplugin/group" mrp="/sf/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+ </component>
+ <component name="fontstore" long-name="Font Store" purpose="mandatory">
+ <unit bldFile="/sf/os/textandloc/fontservices/fontstore/group" mrp="/sf/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+ </component>
+ <component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
+ <!-- placeholder for text code from GDI -->
+ </component>
+ <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/sf/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+ </component>
+ <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+ </component>
+ </collection>
+ <collection name="textlayout" long-name="Text Layout" level="text">
+ <component name="texthandling" long-name="Text Handling" purpose="optional">
+ <unit bldFile="/sf/os/textandloc/textrendering/texthandling/group" mrp="/sf/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+ </component>
+ <component name="textformatting" long-name="Text Formatting" purpose="optional">
+ <unit bldFile="/sf/os/textandloc/textrendering/textformatting/group" mrp="/sf/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+ </component>
+ <component name="word" long-name="Word" purpose="development" filter="test">
+ <unit mrp="/sf/os/textandloc/textrendering/word/group/app-framework_word.mrp" bldFile="/sf/os/textandloc/textrendering/word/group"/>
+ </component>
+ </collection>
+ <collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
+ <!-- components in this collection need to be moved to the right collection.
+ Either move into the units' directories, or create a new textandlocutils directory -->
+ <component name="numbergrouping" filter="s60" long-name="Number Grouping">
+ <unit bldFile="/sf/os/textandloc/charconvfw/numbergrouping/group"/>
+ </component>
+ <component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
+ <unit bldFile="/sf/os/textandloc/charconvfw/jplangutil/group"/>
+ </component>
+ <component name="sortutil" filter="s60" long-name="Sorting Utility">
+ <unit bldFile="/sf/os/textandloc/charconvfw/sortutil/group"/>
+ </component>
+ <component name="inlinetext" filter="s60" long-name="Inline Text">
+ <unit bldFile="/sf/os/textandloc/charconvfw/inlinetext/group"/>
+ </component>
+ <component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
+ <!-- placeholder for split from bafl -->
+ </component>
+ <component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/textandloc/textrendering/numberformatting/group" mrp="/sf/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+ </component>
+ </collection>
+ <collection name="localesupport" long-name="Locale Support" level="util">
+ <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/textandloc/localisation/localesupport" mrp="/sf/os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+ </component>
+ <component name="initlocale" long-name="Initialise Locale" introduced="^2" purpose="mandatory" class="placeholder">
+ <!-- placeholder for split from bafl -->
+ </component>
+ </collection>
+ <collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
+ <component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
+ <!-- placeholder for split from GDI Tools -->
+ </component>
+ <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
+ <unit bldFile="/sf/os/graphics/graphicstools/bitmapfonttools/group" mrp="/sf/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+ </component>
+ </collection>
+ <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
+ <component name="textandloc_pub" filter="s60" long-name="Text and Localisation Public Interfaces" class="api">
+ <unit bldFile="/sf/os/textandloc/textandloc_pub/group"/>
+ </component>
+ <component name="textandloc_plat" filter="s60" long-name="Text and Localisation Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/textandloc/textandloc_plat/group"/>
+ </component>
+ <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/textandloc/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="textandloc" name="Text and Localisation Services" levels="encoding util fonts tools text">
+ <collection id="charconvfw" name="Character Conversion" level="encoding">
+ <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
+ <unit bldFile="charconvfw/charconv_fw/group" mrp="charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+ </component>
+ <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
+ <unit bldFile="charconvfw/charconvplugins/group" mrp="charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+ </component>
+ <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
+ <unit bldFile="charconvfw/fatfilenameconversionplugins/group" mrp="charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+ </component>
+ </collection>
+ <collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
+ <component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin">
+ <unit bldFile="fontservices/textshaperplugin/group" mrp="fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+ </component>
+ <component id="fontstore" name="Font Store" purpose="mandatory">
+ <unit bldFile="fontservices/fontstore/group" mrp="fontservices/fontstore/group/graphics_fntstore.mrp"/>
+ </component>
+ <component id="textrendering" name="Text Rendering" purpose="mandatory">
+ <!-- placeholder for text code from GDI -->
+ </component>
+ <component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
+ <unit bldFile="fontservices/freetypefontrasteriser/group" mrp="fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+ </component>
+ <component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
+ <unit bldFile="fontservices/referencefonts/group" mrp="fontservices/referencefonts/group/graphics_fonts.mrp"/>
+ </component>
+ </collection>
+ <collection id="textlayout" name="Text Layout" level="text">
+ <component id="texthandling" name="Text Handling" purpose="optional">
+ <unit bldFile="textrendering/texthandling/group" mrp="textrendering/texthandling/group/app-framework_etext.mrp"/>
+ </component>
+ <component id="textformatting" name="Text Formatting" purpose="optional">
+ <unit bldFile="textrendering/textformatting/group" mrp="textrendering/textformatting/group/app-framework_form.mrp"/>
+ </component>
+ <component id="word" name="Word" purpose="development" filter="test">
+ <unit mrp="textrendering/word/group/app-framework_word.mrp" bldFile="textrendering/word/group"/>
+ </component>
+ </collection>
+ <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
+ <component id="localizer" filter="s60" name="Directory Localizer">
+ <!-- pending move to classicui/uiutils -->
+ <unit bldFile="charconvfw/localizer/group"/>
+ </component>
+ <component id="findutil" filter="s60" name="Find Utility">
+ <!-- pending move to classicui/uiutils -->
+ <unit bldFile="charconvfw/findutil/group"/>
+ </component>
+ <component id="numbergrouping" filter="s60" name="Number Grouping">
+ <unit bldFile="charconvfw/numbergrouping/group"/>
+ </component>
+ <component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
+ <!-- pending move to appsupport -->
+ <unit bldFile="charconvfw/gamerecognizer/group"/>
+ </component>
+ <component id="jplangutil" filter="s60" name="Japanese Language Utilities">
+ <unit bldFile="charconvfw/jplangutil/group"/>
+ </component>
+ <component id="sortutil" filter="s60" name="Sorting Utility">
+ <unit bldFile="charconvfw/sortutil/group"/>
+ </component>
+ <component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
+ <!-- pending move to classicui/uiutils -->
+ <unit bldFile="charconvfw/aknjapanesereading/group"/>
+ </component>
+ <component id="inlinetext" filter="s60" name="Inline Text">
+ <unit bldFile="charconvfw/inlinetext/group"/>
+ </component>
+ <component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+ <!-- placeholder for split from bafl -->
+ </component>
+ <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
+ <unit bldFile="textrendering/numberformatting/group" mrp="textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+ </component>
+ </collection>
+ <collection id="localesupport" name="Locale Support" level="util">
+ <component id="reflocales" name="Reference Locales" purpose="optional" class="plugin">
+ <unit bldFile="localisation/localesupport" mrp="localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+ </component>
+ <component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
+ <!-- placeholder for split from bafl -->
+ </component>
+ </collection>
+ <collection id="textandloctools" name="Text and Localisation Tools" level="tools">
+ <component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
+ <!-- placeholder for split from GDI Tools -->
+ </component>
+ <component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
+ <unit bldFile="../graphics/graphicstools/bitmapfonttools/group" mrp="../graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+ </component>
+ </collection>
+ <collection id="textandloc_info" name="Text and Localisation Info" level="text">
+ <component id="textandloc_pub" filter="s60" name="Text and Localisation Public Interfaces" class="api">
+ <unit bldFile="textandloc_pub/group"/>
+ <!-- <unit bldFile="textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
+ </component>
+ <component id="textandloc_plat" filter="s60" name="Text and Localisation Platform Interfaces" class="api">
+ <unit bldFile="textandloc_plat/group"/>
+ <!-- <unit bldFile="textandloc_plat/findutil_api/tsrc/group"/> -->
+ <!-- <unit bldFile="textandloc_plat/sortutil_api/tsrc/group"/> -->
+ </component>
+ <component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/usb/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/usb/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,125 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
-<component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
-<unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-</component>
-</collection>
-<collection name="usbmgmt" long-name="USB Management" level="server">
-<component name="usbmgr" long-name="USB Manager" purpose="optional">
-<unit bldFile="/sf/os/usb/usbmgmt/usbmgr/group" mrp="/sf/os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-</component>
-<component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/usb/usbmgmt/usbmgrtest/group/usb_test.mrp" version="2"/>
-</component>
-<component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-</component>
-</collection>
-<collection name="usb_info" long-name="USB Info" level="app-if">
-<component name="usb_metadata" long-name="USB Metadata" introduced="tb92" purpose="development" class="config PC">
-<unit mrp="/sf/os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
+ <!-- usbclientdrivers to be moved here from kernelhwsrv-->
+ </collection>
+ <collection name="usbextension" long-name="USB Extension" level="framework">
+ <component name="usbaudioclassdriver" long-name="USB Audi Class Driver" purpose="optional" filter="s60">
+ <unit bldFile="/sf/os/usb/usbextension/usbaudioclassdriver/group"/>
+ </component>
+ </collection>
+ <collection name="usbmgmt" long-name="USB Management" level="server">
+ <component name="usbmgr" long-name="USB Manager" purpose="optional">
+ <unit bldFile="/sf/os/usb/usbmgmt/usbmgr/group" mrp="/sf/os/usb/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
+ </component>
+ <component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
+ <unit mrp="/sf/os/usb/usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="/sf/os/usb/usbmgmt/usbmgrtest/group" version="2"/>
+ </component>
+ <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection name="usb_info" long-name="USB Info" level="app-if">
+ <component name="usb_plat" filter="s60" long-name="USB Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/usb/usb_plat/group"/>
+ </component>
+ <component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
+ <unit mrp="/sf/os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/usb/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
+ <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
+ <!-- usbclientdrivers to be moved here from kernelhwsrv-->
+ </collection>
+ <collection id="usbmgmt" name="USB Management" level="server">
+ <component id="usbmgr" name="USB Manager" purpose="optional">
+ <unit version="2" bldFile="usbmgmt/usbmgr/group" mrp="usbmgmt/usbmgr/group/usb_manager.mrp"/>
+ </component>
+ <component id="usbmgrtest" name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
+ <unit version="2" mrp="usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="usbmgmt/usbmgrtest/group"/>
+ </component>
+ <component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
+ <unit mrp="usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection id="usb_info" name="USB Info" level="app-if">
+ <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+ <unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/wlan/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/wlan/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,119 +1,120 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
-<collection name="wlanapitest" long-name="WLAN API Tests" level="test">
-<component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/os/wlan/wlanapitest/wlanhaitest/group/wlanhaitest.mrp"/>
-</component>
-</collection>
-<collection name="wlan_info" long-name="WLAN Info" level="test">
-<component name="wlan_metadata" long-name="WLAN Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="wlan">
-<unit bldFile="/sf/os/wlan/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
+ <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
+ <component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+ </component>
+ <component name="wlanagent" filter="s60" long-name="WLAN Agent">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlanagent/group"/>
+ </component>
+ <component name="wlandbif_cd" filter="s60" long-name="WLAN CommsDat interface">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlandbif_cd/group"/>
+ </component>
+ <!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+ <component name="wlanengine" filter="s60" long-name="WLAN Engine">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+ </component>
+ <component name="wlanldd" filter="s60" long-name="WLAN LDD">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+ </component>
+ <component name="wlannwif" filter="s60" long-name="WLAN Network Interface">
+ <unit bldFile="/sf/os/wlan/wlan_bearer/wlannwif/group"/>
+ </component>
+ </collection>
+ <collection name="wlanapitest" long-name="WLAN API Tests" level="test">
+ <component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="/sf/os/wlan/wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="/sf/os/wlan/wlanapitest/wlanhaitest/group"/>
+ </component>
+ </collection>
+ <collection name="wlan_info" long-name="WLAN Info" level="test">
+ <component name="wlan_pub" filter="s60" long-name="WLAN Public Interfaces" class="api">
+ <unit bldFile="/sf/os/wlan/wlan_pub/group"/>
+ </component>
+ <component name="wlan_plat" filter="s60" long-name="WLAN Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/wlan/wlan_plat/group"/>
+ </component>
+ <component name="wlan_metadata" long-name="WLAN Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/wlan/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="wlan" name="WLAN" levels="hw low mid high tools test">
+ <collection id="wlan_bearer" name="WLAN Bearer" level="hw">
+ <component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
+ <unit bldFile="wlan_bearer/wlanpsmplugin/group"/>
+ </component>
+ <component id="wlanagent" filter="s60" name="WLAN Agent">
+ <unit bldFile="wlan_bearer/wlanagent/group"/>
+ </component>
+ <component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
+ <unit bldFile="wlan_bearer/wlandbif_cd/group"/>
+ </component>
+ <component id="wlanengine" filter="s60" name="WLAN Engine">
+ <unit bldFile="wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+ </component>
+ <component id="wlanldd" filter="s60" name="WLAN LDD">
+ <unit bldFile="wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+ </component>
+ <component id="wlannwif" filter="s60" name="WLAN Network Interface">
+ <unit bldFile="wlan_bearer/wlannwif/group"/>
+ </component>
+ </collection>
+ <collection id="wlanapitest" name="WLAN API Tests" level="test">
+ <component id="wlanhaitest" name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
+ <unit mrp="wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="wlanapitest/wlanhaitest/group"/>
+ </component>
+ </collection>
+ <collection id="wlan_info" name="WLAN Info" level="test">
+ <component id="wlan_pub" filter="s60" name="WLAN Public Interfaces" class="api">
+ <unit bldFile="wlan_pub/group"/>
+ </component>
+ <component id="wlan_plat" filter="s60" name="WLAN Platform Interfaces" class="api">
+ <unit bldFile="wlan_plat/group"/>
+ </component>
+ <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="wlan_info/wlan_metadata/wlan_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian3/os/xmlsrv/package_definition.xml Wed Feb 03 11:49:07 2010 +0000
+++ b/symbian3/os/xmlsrv/package_definition.xml Wed Feb 03 19:36:09 2010 +0000
@@ -1,134 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) 'N'
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
-<collection name="xml" long-name="XML" level="generic">
-<component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/os/xmlsrv/xml/xmlfw/group" mrp="/sf/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-</component>
-<component name="libxml2libs" long-name="Libxml2 Libraries" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/xmlsrv/xml/libxml2libs/group" mrp="/sf/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-</component>
-<component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/xmlsrv/xml/xmldomandxpath/group" mrp="/sf/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-</component>
-<component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/xmlsrv/xml/xmlexpatparser/group" mrp="/sf/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-</component>
-<component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/sf/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-</component>
-<component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/xmlsrv/xml/wbxmlparser/group" mrp="/sf/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-</component>
-</collection>
-<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="xmlsrv">
-<unit bldFile="/sf/os/xmlsrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!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 >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!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="os" long-name="OS" levels="hw services">
+ <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
+ <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
+ <component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
+ <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
+ </component>
+ <component name="xmlsec" filter="s60" long-name="XML Security">
+ <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
+ </component>
+ <component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
+ <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
+ </component>
+ <component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
+ <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
+ </component>
+ </collection>
+ <collection name="xml" long-name="XML" level="generic">
+ <component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/xmlsrv/xml/xmlfw/group" mrp="/sf/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+ </component>
+ <component name="libxml2libs" long-name="Libxml2 Libraries" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/xmlsrv/xml/libxml2libs/group" mrp="/sf/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+ </component>
+ <component name="legacyminidomparser" long-name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+ <unit bldFile="/sf/os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="/sf/os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+ </component>
+ <component name="xmldomandxpath" long-name="XML DOM and XPath" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/xmlsrv/xml/xmldomandxpath/group" mrp="/sf/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+ </component>
+ <component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/xmlsrv/xml/xmlexpatparser/group" mrp="/sf/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+ </component>
+ <component name="xmllibxml2parser" long-name="XML Libxml2 Parser" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/sf/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+ </component>
+ <component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/xmlsrv/xml/wbxmlparser/group" mrp="/sf/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+ </component>
+ </collection>
+ <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
+ <component name="xmlsrv_plat" filter="s60" long-name="XML Services Platform Interfaces" class="api">
+ <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/group"/>
+ </component>
+ <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/os/xmlsrv/package_definition_3.0.xml Wed Feb 03 19:36:09 2010 +0000
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="xmlsrv" name="XML Services" levels="plugin server framework generic specific">
+ <collection id="xmlengine" name="XML Engine" level="server">
+ <component id="libxml2" filter="s60" name="Libxml2" deprecated="^3">
+ <!-- deprecated due to duplication -->
+ <unit bldFile="xmlengine/libxml2/group"/>
+ </component>
+ <component id="xmlengineutils" filter="s60" name="XML Engine Utils" deprecated="^3">
+ <!-- deprecated due to duplication -->
+ <unit bldFile="xmlengine/xmlengineutils/group"/>
+ </component>
+ <component id="domxpathwrapper" filter="s60" name="DOM XPath Wrapper" deprecated="^3">
+ <!-- deprecated due to duplication -->
+ <unit bldFile="xmlengine/domxpathwrapper/group"/>
+ </component>
+ <component id="xmlengineserializer" filter="s60" name="XML Engines Serializer" deprecated="^3">
+ <!-- deprecated due to duplication -->
+ <unit bldFile="xmlengine/xmlengineserializer/group"/>
+ </component>
+ <component id="xmlenginesaxplugin" filter="s60" name="XML Engine SAX Plugin" class="plugin" deprecated="^3">
+ <!-- deprecated due to duplication -->
+ <unit bldFile="xmlengine/xmlenginesaxplugin/group"/>
+ </component>
+ <component id="xmlengine_build" filter="s60" name="XML Engine Build" deprecated="^3">
+ <!-- deprecated due to duplication -->
+ <!-- can the hrh #include be moved to the appropriate other bld.infs? -->
+ <unit bldFile="xmlengine/group"/>
+ </component>
+ </collection>
+ <collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
+ <component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
+ <unit bldFile="xmlsecurityengine/xmlseccertman/group"/>
+ </component>
+ <component id="xmlsec" filter="s60" name="XML Security">
+ <unit bldFile="xmlsecurityengine/xmlsec/group"/>
+ </component>
+ <component id="xmlseccrypto" filter="s60" name="XML Security Crypto">
+ <unit bldFile="xmlsecurityengine/xmlseccrypto/group"/>
+ </component>
+ <component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
+ <unit bldFile="xmlsecurityengine/xmlsecwrapper/group"/>
+ </component>
+ <component id="xmlsecurityengine_build" filter="s60" name="XML Security Engine Build">
+ <!-- can the hrh #include be moved to the appropriate other bld.infs? -->
+ <unit bldFile="xmlsecurityengine/group"/>
+ </component>
+ </collection>
+ <collection id="xml" name="XML" level="generic">
+ <component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
+ <unit bldFile="xml/xmlfw/group" mrp="xml/xmlfw/group/syslibs_xml.mrp"/>
+ </component>
+ <component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
+ <unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+ </component>
+ <component id="legacyminidomparser" name="legacyminidomparser" introduced="7.0s" purpose="optional">
+ <unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp" />
+ </component>
+ <component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
+ <unit bldFile="xml/xmldomandxpath/group" mrp="xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+ </component>
+ <component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="xml/xmlexpatparser/group" mrp="xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+ </component>
+ <component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="xml/xmllibxml2parser/group" mrp="xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+ </component>
+ <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="xml/wbxmlparser/group" mrp="xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+ </component>
+ </collection>
+ <collection id="xmlsrv_info" name="XML Services Info" level="specific">
+ <component id="xmlsrv_plat" filter="s60" name="XML Services Platform Interfaces" class="api">
+ <unit bldFile="xmlsrv_plat/group"/>
+ <!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
+ <!-- <unit bldFile="xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
+ <!-- <unit bldFile="xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
+ <!-- <unit bldFile="xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
+ <!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
+ <!-- <unit bldFile="xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
+ </component>
+ <component id="xmlsrv_build" filter="s60" name="XML Services Build">
+ <!-- move ifdef into appropriate bld.inf -->
+ <unit bldFile="group"/>
+ </component>
+ <component id="xmlsrv_pub" filter="s60" name="XML Services Public Interfaces" class="api">
+ <unit bldFile="xmlsrv_pub/group"/>
+ <!-- <unit bldFile="xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
+ </component>
+ <component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>