--- a/symbian4/single/sysdefs/system_model.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml Tue Aug 24 17:58:04 2010 +0100
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!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
->
-]>
+<!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^4" schema="2.0.1">
<systemModel>
<layer name="adaptation" long-name="Adaptation" levels="low mw high">
@@ -614,7 +614,7 @@
<unit bldFile="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
+<!-- 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="os/ossrv/ofdbus/group"/>
</component>
@@ -2043,7 +2043,7 @@
<unit bldFile="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
+<!-- need to #include the lot from a single bld.inf
Also move to a standard component location, not under effectspresets -->
<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -3342,9 +3342,9 @@
<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
</component>
<component name="supl_pos_message_plugin_api" long-name="SUPL POS Message Plugin API" filter="s60" class="api placeholder">
-<!-- placeholder
- <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
- <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+<!-- placeholder
+ <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+ <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
-->
</component>
<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
@@ -5698,7 +5698,7 @@
</collection>
<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
Can remove this once configuration is in place-->
<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
</component>
@@ -5915,9 +5915,6 @@
<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
</component>
-<component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
-</component>
<component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
</component>
@@ -6131,9 +6128,6 @@
<component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
</component>
-<component name="ganes_api" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-</component>
<component name="ode_api" long-name="Ode API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
</component>
@@ -6152,11 +6146,6 @@
<component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
</component>
-<component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
-<!-- should this be commented out? -->
-<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
-</component>
<component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
</component>
@@ -6166,8 +6155,6 @@
<component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_plat/findutil_api/group"/>
</component>
-</collection>
-<collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
<component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
</component>
@@ -6647,10 +6634,10 @@
<component name="fontprovider" filter="s60" long-name="Font Provider">
<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+ <component id="s60_fonts" filter="s60" name="S60 Fonts">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
-->
<component name="fontutils" filter="sf_build" long-name="Font Utils">
<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -6744,15 +6731,15 @@
</collection>
<collection name="controlpanel" long-name="Control Panel" level="generic">
<component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60" class="placeholder">
-<!-- Need to create a real .pro file for this
+<!-- Need to create a real .pro file for this
<unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
</component>
<component name="controlpanel_config" long-name="Control Panel Config" filter="s60" introduced="^4" class="config placeholder">
-<!-- Need to create a real .pro file for this
+<!-- Need to create a real .pro file for this
<unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
</component>
<component name="controlpanel_source" long-name="Control Panel Source" filter="s60" class="placeholder">
-<!-- Uncomment when controlpanel_build is removed
+<!-- Uncomment when controlpanel_build is removed
<unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
</component>
<component name="controlpanel_build" long-name="Control Panel Build" filter="s60">
@@ -7232,7 +7219,7 @@
<unit bldFile="mw/web/codhandler/roapapp/group"/>
</component>
<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
#included .hrh file needs to be #included in each of the other components -->
<unit bldFile="mw/web/codhandler/group"/>
</component>
@@ -8083,14 +8070,14 @@
<collection name="calendarwidgetinstaller" long-name="Calendar Widget Installer" level="build">
<!-- collection is really a component, need to move down a directory -->
<component name="calendarwidgetinstaller_build" long-name="Calendar Widget Installer Build" filter="dfs_build" introduced="^4" class="placeholder">
-<!-- built by calendarwidget_rom
+<!-- built by calendarwidget_rom
<unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
</component>
</collection>
<collection name="calendarwidgetplugin" long-name="Calendar Widget Plugin" level="app">
<!-- collection is really a component, need to move down a directory -->
<component name="calendarwidgetplugin_build" long-name="Calendar Widget Plugin Build" filter="dfs_build" introduced="^4" plugin="Y" class="placeholder">
-<!-- built by calendarwidget_rom
+<!-- built by calendarwidget_rom
<unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
</component>
<component name="calendarwidgetplugin_test" long-name="Calendar Widget Plugin Test" filter="dfs_build" introduced="^4">