--- a/CompilerCompatibility/mw/mmmw/package_definition.xml Mon Mar 15 18:47:03 2010 +0000
+++ b/CompilerCompatibility/mw/mmmw/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,98 +49,73 @@
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="mw" long-name="Middleware" levels="generic specific">
<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
-<collection name="mmmiddlewarefws" long-name="Multimedia Middleware Frameworks" level="server">
-<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group/multimedia_mmf.mrp"/>
-</component>
-</collection>
-<collection name="mmmiddlewareplugins" long-name="Multimedia Middleware Plugins" level="framework">
-<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group_plugin" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group_plugin/multimedia_mmf_plugin.mrp"/>
-</component>
-</collection>
-<collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
-<component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" purpose="development">
-<unit mrp="/sf/mw/mmmw/mmfwtest/mmfunittest/group/multimedia_unittest_mmf_source.mrp"/>
-</component>
-<component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" purpose="development">
-<unit mrp="/sf/mw/mmmw/mmfwtest/mmfintegrationtest/group/multimedia_inttest_mmf_source.mrp"/>
-</component>
-<component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" purpose="development">
-<unit bldFile="/sf/mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group" mrp="/sf/mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group/multimedia_mmf_char.mrp"/>
-</component>
-</collection>
-<collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
-<component name="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" purpose="development">
-<unit bldFile="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group" mrp="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group/multimedia_mvs_app.mrp"/>
-</component>
-<component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91" purpose="development">
-<unit bldFile="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group" mrp="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group/multimedia_mvs_agents.mrp"/>
-</component>
-<component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" purpose="development">
-<unit mrp="/sf/mw/mmmw/mmvalidationsuite/mvsintegrationtest/group/multimedia_inttest_mvs_source.mrp"/>
-</component>
-</collection>
-<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="mmmw">
-<unit bldFile="/sf/mw/mmmw/group" mrp=""/>
-</component>
-</collection>
-</block>
+ <collection name="mmfenh" long-name="MMF Enhancements" level="generic">
+ <component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
+ </component>
+ <component name="audiooutputcontrolutility" filter="s60" long-name="Audio Output Control Utility">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
+ </component>
+ <component name="configurationcomponentsfactory" filter="s60" long-name="Configuration Components Factory">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
+ </component>
+ <component name="enhancedaudioplayerutility" filter="s60" long-name="Enhanced Audio Player Utility">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
+ </component>
+ <component name="enhancedmediaclient" filter="s60" long-name="Enhanced Media Client">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/enhancedmediaclient/group"/>
+ </component>
+ <component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
+ </component>
+ <component name="progressivedownload" filter="s60" long-name="Progressive Download">
+ <unit bldFile="/sf/mw/mmmw/mmfenh/progressivedownload/group"/>
+ </component>
+ </collection>
+ <collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
+ <!-- Id needs to be unique, mmfw already in use -->
+ <!-- Placeholder for OpenAX AL and other stuff -->
+ </collection>
+ <collection name="mmserv" long-name="Multimedia Services" level="specific">
+ <component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
+ <unit bldFile="/sf/mw/mmmw/mmserv/audioeffectsui/group"/>
+ </component>
+ <component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
+ <unit bldFile="/sf/mw/mmmw/mmserv/callaudiocontrol/group"/>
+ </component>
+ <component name="metadatautility" filter="s60" long-name="Metadata Utility">
+ <unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/group"/>
+ </component>
+ <component name="radioutility" filter="s60" long-name="Radio Utility">
+ <unit bldFile="/sf/mw/mmmw/mmserv/radioutility/group"/>
+ </component>
+ <component name="thumbnailengine" filter="s60" long-name="Thumbnail Engine" introduced="^2">
+ <unit bldFile="/sf/mw/mmmw/mmserv/thumbnailengine/group"/>
+ </component>
+ <component name="tms" filter="s60" long-name="Telephony Multimedia Service" introduced="^3">
+ <unit bldFile="/sf/mw/mmmw/mmserv/tms/group"/>
+ </component>
+ <component name="voipaudioservices" filter="s60" long-name="VoIP Audio Services">
+ <unit bldFile="/sf/mw/mmmw/mmserv/voipaudioservices/group"/>
+ </component>
+ <component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
+ <unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+ </component>
+ </collection>
+ <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
+ <component name="mmmw_plat" filter="s60" long-name="Multimedia Middleware Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/mmmw/mmmw_plat/group"/>
+ </component>
+ <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
</layer>
</systemModel>
</SystemDefinition>
\ No newline at end of file