--- a/CompilerCompatibility/app/devicecontrol/package_definition.xml Mon Mar 15 18:47:03 2010 +0000
+++ b/CompilerCompatibility/app/devicecontrol/package_definition.xml Tue Mar 16 16:25:56 2010 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ELEMENT SystemDefinition (systemModel)>
<!ATTLIST SystemDefinition
name CDATA #REQUIRED
schema CDATA #REQUIRED>
@@ -49,61 +49,110 @@
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">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
<systemModel>
<layer name="app" long-name="Applications" levels="services apps">
-<block name="devicecontrol" level="services" long-name="Device Control Daemons">
-<collection name="s60">
-<component name="devicecontrol">
-<unit bldFile="/sf/app/devicecontrol/group" mrp=""/>
-</component>
-</collection>
-</block>
+<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
+ <collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
+ <component name="devdiagapp" filter="s60" long-name="Device Diagnostics App">
+ <unit bldFile="/sf/app/devicecontrol/devicediagnostics/devdiagapp/group"/>
+ </component>
+ <component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
+ </component>
+ <component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/devicediagnostics/diagplugins/group"/>
+ </component>
+ <component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/devicediagnostics/diagsuites/group"/>
+ </component>
+ <component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
+ <!-- can the exports be moved to one of the other components?
+ or all #includes removed from here, and it renamed Device Diagnostics ROM -->
+ <unit bldFile="/sf/app/devicecontrol/devicediagnostics/group"/>
+ </component>
+ </collection>
+ <collection name="omadm" long-name="OMA Device Management" level="oma">
+ <component name="omadmappui" filter="s60" long-name="OMA DM Application UI">
+ <unit bldFile="/sf/app/devicecontrol/omadm/omadmappui/group"/>
+ </component>
+ <component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/group"/>
+ </component>
+ <component name="dcmo" filter="s60" long-name="Device Capabilities Management Object" introduced="^3" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/omadm/dcmo/group"/>
+ </component>
+ </collection>
+ <collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
+ <component name="pnpms" filter="s60" long-name="PnP MS">
+ <unit bldFile="/sf/app/devicecontrol/pnpmobileservices/pnpms/group"/>
+ </component>
+ </collection>
+ <collection name="applicationmanagement" long-name="Application Management" level="app">
+ <!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
+ <component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
+ <unit bldFile="/sf/app/devicecontrol/applicationmanagement/options/group"/>
+ </component>
+ <component name="applicationmanagement_client" filter="s60" long-name="AM Client">
+ <unit bldFile="/sf/app/devicecontrol/applicationmanagement/client/group"/>
+ </component>
+ <component name="applicationmanagement_server" filter="s60" long-name="AM Server">
+ <unit bldFile="/sf/app/devicecontrol/applicationmanagement/server/group"/>
+ </component>
+ <component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/applicationmanagement/rfsplugin/group"/>
+ </component>
+ <component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/applicationmanagement/amadapter2/group"/>
+ </component>
+ <component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/applicationmanagement/amadapter2/group"/>
+ </component>
+ <component name="applicationmanagement_build" filter="s60" long-name="AM Build">
+ <!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed AM ROM? -->
+ <unit bldFile="/sf/app/devicecontrol/applicationmanagement/group"/>
+ </component>
+ </collection>
+ <collection name="customization" long-name="DM Customization Adapters" level="mid">
+ <component name="dmutils" long-name="DM Utils" filter="s60">
+ <unit bldFile="/sf/app/devicecontrol/customization/dmutils/bld"/>
+ </component>
+ <component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
+ <unit bldFile="/sf/app/devicecontrol/customization/uisettingssrv/bld"/>
+ </component>
+ <component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/customization/isadapter/bld"/>
+ </component>
+ <component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/customization/supadapter/bld"/>
+ </component>
+ <component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/customization/wallpaperadapter/bld"/>
+ </component>
+ <component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/customization/operatorlogoadapter/bld"/>
+ </component>
+ <component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/customization/screensaveradapter/bld"/>
+ </component>
+ <component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/customization/themesadapter/bld"/>
+ </component>
+ <component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/customization/embeddedlinkadapter/bld"/>
+ </component>
+ <component name="customization_build" filter="s60" long-name="DM Customization Build">
+ <!-- If thes aren't collapsed into one cmp, can all #includes removed from here, and it renamed DM Customization ROM? -->
+ <unit bldFile="/sf/app/devicecontrol/customization/group"/>
+ </component>
+ </collection>
+ <collection name="omacp" long-name="OMA Content Provisioning" level="oma">
+ <component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
+ <unit bldFile="/sf/app/devicecontrol/omacp/omacpadapters/group"/>
+ </component>
+ </collection>
+ </block>
</layer>
</systemModel>
</SystemDefinition>
\ No newline at end of file