--- a/foundation/sysdefs/system_model.xml Fri Aug 07 14:20:39 2009 +0100
+++ b/foundation/sysdefs/system_model.xml Fri Aug 07 14:23:04 2009 +0100
@@ -2917,99 +2917,6 @@
</component>
</collection>
</block>
-
- <block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">
- <collection name="dtdinstaller" long-name="DTD Installer" level="install">
- <component name="dtdinstaller_build" origin-model="foundation">
- <unit bldFile="tools/homescreentools/dtdinstaller/group"/>
- </component>
- </collection>
- <collection name="themeinstaller" long-name="Theme Installer" level="install">
- <component name="themeinstaller_build" origin-model="foundation">
- <unit bldFile="tools/homescreentools/themeinstaller/group"/>
- </component>
- </collection>
- <collection name="themetool" long-name="Theme Tool" level="tool">
- <component name="themetool_build" origin-model="foundation">
- <unit bldFile="tools/homescreentools/themetool/group"/>
- </component>
- </collection>
- <collection name="homescreentools_info" long-name="Home Screen Tools Info" level="install">
- <component unofficial="yes" name="homescreentools_build" long-name="Home Screen Tools Build" origin-model="foundation">
- <unit bldFile="tools/homescreentools/group"/>
- </component>
- </collection>
- </block>
- <block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
- <collection name="creator" long-name="Creator" level="app">
- <component name="creator_build" origin-model="foundation">
- <unit bldFile="tools/rndtools/creator/group"/>
- </component>
- </collection>
- <collection name="filebrowser" long-name="File Browser" level="specific">
- <component name="fileopserver" long-name="File Op Server" origin-model="foundation">
- <unit bldFile="tools/rndtools/filebrowser/fileopserver/group"/>
- </component>
- <component name="fileopclient" long-name="File Op Client" origin-model="foundation">
- <unit bldFile="tools/rndtools/filebrowser/fileopclient/group"/>
- </component>
- <component name="filebrowser_build" origin-model="foundation">
- <unit bldFile="tools/rndtools/filebrowser/group"/>
- </component>
- </collection>
- <collection name="launcher" long-name="Launcher" level="specific">
- <component name="launcher_build" origin-model="foundation">
- <unit bldFile="tools/rndtools/launcher/group"/>
- </component>
- </collection>
- <collection name="screengrabber" long-name="Screen Grabber" level="specific">
- <component name="screengrabber_build" origin-model="foundation">
- <unit bldFile="tools/rndtools/screengrabber/group"/>
- </component>
- </collection>
- <collection name="stifui" long-name="STIF UI" level="generic">
- <component name="stifui_stifui" long-name="STIF UI" origin-model="foundation">
- <unit bldFile="tools/rndtools/stifui/stifui/group"/>
- </component>
- <component name="uitestserverstarter" long-name="UI Test Server Starter" origin-model="foundation">
- <unit bldFile="tools/rndtools/stifui/uitestserverstarter/group"/>
- </component>
- <component unofficial="yes" name="stifui_build" long-name="STIF UI Build" origin-model="foundation">
- <unit bldFile="tools/rndtools/stifui/group"/>
- </component>
- </collection>
- <collection name="loadgen" long-name="Load Generator" level="app">
- <component name="loadgen_build" origin-model="foundation">
- <unit bldFile="tools/rndtools/loadgen/group"/>
- </component>
- </collection>
- <collection name="perfmon" long-name="Performance Monitor" level="app">
- <component name="perfmon_build" origin-model="foundation">
- <unit bldFile="tools/rndtools/perfmon/group"/>
- </component>
- </collection>
- <collection name="htiui" long-name="HTI UI" level="generic">
- <!-- Empty duplicate component HtiCommPlugins removed -->
- <!-- Empty duplicate component HtiServicePlugins removed -->
- <component name="htidevicereboot" long-name="HTI DeviceR eboot" origin-model="foundation">
- <unit bldFile="tools/rndtools/htiui/htidevicereboot/group"/>
- </component>
- <component name="htistartupwait" long-name="HTI Startup Wait" origin-model="foundation">
- <unit bldFile="tools/rndtools/htiui/htistartupwait/group"/>
- </component>
- <component name="htiadmin" long-name="HTI Admin" origin-model="foundation">
- <unit bldFile="tools/rndtools/htiui/htiadmin/group"/>
- </component>
- <component unofficial="yes" name="htiui_build" long-name="HTI UI Build" origin-model="foundation">
- <unit bldFile="tools/rndtools/htiui/group"/>
- </component>
- </collection>
- <collection name="memspyui" long-name="Memspy UI" level="generic">
- <component name="memspyui_build" origin-model="foundation">
- <unit bldFile="tools/rndtools/memspyui/group"/>
- </component>
- </collection>
- </block>
</layer>
<layer name="mw" long-name="Middleware" levels="generic specific">
<block name="accesssec" long-name="Access Security" tech_domain="se" level="generic" levels="plugin framework server generic specific">
@@ -7407,21 +7314,6 @@
</component>
</collection>
</block>
- <block name="platformtools" long-name="Platform Tools" tech_domain="to" level="generic">
- <collection name="gfxconversion" long-name="Graphics Conversion">
- <component name="bmconv_s60" long-name="Bm Conv S60" origin-model="foundation">
- <unit bldFile="tools/platformtools/gfxconversion/bmconv_s60/group"/>
- </component>
- <component name="mifconv" long-name="Mifconv" origin-model="foundation">
- <unit bldFile="tools/platformtools/gfxconversion/mifconv/group"/>
- </component>
- </collection>
- <collection name="platformtools_info" long-name="Platform Tools Info">
- <component unofficial="yes" name="platformtools_build" long-name="Platform Tools Build" origin-model="foundation">
- <unit bldFile="tools/platformtools/group"/>
- </component>
- </collection>
- </block>
</layer>
<layer name="os" long-name="OS" levels="hw services">
<block name="boardsupport" long-name="Board Support" level="hw" levels="bsp test 2 3 4">
@@ -9888,6 +9780,8 @@
</component>
</collection>
</block>
+ </layer>
+ <layer name="ostools" long-name="OS Tools">
<block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
<collection name="stif" long-name="STIF" level="fw">
<component name="testinterface" long-name="Test Interface" origin-model="foundation">
@@ -9998,11 +9892,11 @@
<component unofficial="yes" name="osrndtools_build" long-name="OS RD tools Build" origin-model="foundation">
<unit bldFile="ostools/osrndtools/group"/>
</component>
- <component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+ <component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
<unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
</component>
</collection>
- <collection name="osrndtools_plat" long-name="OS RD tools Platform Interfaces" level="trace">
+ <collection name="osrndtools_plat" long-name="OS RD tools Platform Interfaces" level="trace">
<component unofficial="yes" name="memspy_api" origin-model="Foundation">
<unit bldFile="ostools/osrndtools/osrndtools_plat/memspy_api/group"/>
</component>
@@ -10017,6 +9911,115 @@
</component>
</collection>
</block>
+ </layer>
+ <layer name="tools" long-name="Tools">
+ <block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">
+ <collection name="dtdinstaller" long-name="DTD Installer" level="install">
+ <component name="dtdinstaller_build" origin-model="foundation">
+ <unit bldFile="tools/homescreentools/dtdinstaller/group"/>
+ </component>
+ </collection>
+ <collection name="themeinstaller" long-name="Theme Installer" level="install">
+ <component name="themeinstaller_build" origin-model="foundation">
+ <unit bldFile="tools/homescreentools/themeinstaller/group"/>
+ </component>
+ </collection>
+ <collection name="themetool" long-name="Theme Tool" level="tool">
+ <component name="themetool_build" origin-model="foundation">
+ <unit bldFile="tools/homescreentools/themetool/group"/>
+ </component>
+ </collection>
+ <collection name="homescreentools_info" long-name="Home Screen Tools Info" level="install">
+ <component unofficial="yes" name="homescreentools_build" long-name="Home Screen Tools Build" origin-model="foundation">
+ <unit bldFile="tools/homescreentools/group"/>
+ </component>
+ </collection>
+ </block>
+ <block name="platformtools" long-name="Platform Tools" tech_domain="to" level="generic">
+ <collection name="gfxconversion" long-name="Graphics Conversion">
+ <component name="bmconv_s60" long-name="Bm Conv S60" origin-model="foundation">
+ <unit bldFile="tools/platformtools/gfxconversion/bmconv_s60/group"/>
+ </component>
+ <component name="mifconv" long-name="Mifconv" origin-model="foundation">
+ <unit bldFile="tools/platformtools/gfxconversion/mifconv/group"/>
+ </component>
+ </collection>
+ <collection name="platformtools_info" long-name="Platform Tools Info">
+ <component unofficial="yes" name="platformtools_build" long-name="Platform Tools Build" origin-model="foundation">
+ <unit bldFile="tools/platformtools/group"/>
+ </component>
+ </collection>
+ </block>
+ <block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
+ <collection name="creator" long-name="Creator" level="app">
+ <component name="creator_build" origin-model="foundation">
+ <unit bldFile="tools/rndtools/creator/group"/>
+ </component>
+ </collection>
+ <collection name="filebrowser" long-name="File Browser" level="specific">
+ <component name="fileopserver" long-name="File Op Server" origin-model="foundation">
+ <unit bldFile="tools/rndtools/filebrowser/fileopserver/group"/>
+ </component>
+ <component name="fileopclient" long-name="File Op Client" origin-model="foundation">
+ <unit bldFile="tools/rndtools/filebrowser/fileopclient/group"/>
+ </component>
+ <component name="filebrowser_build" origin-model="foundation">
+ <unit bldFile="tools/rndtools/filebrowser/group"/>
+ </component>
+ </collection>
+ <collection name="launcher" long-name="Launcher" level="specific">
+ <component name="launcher_build" origin-model="foundation">
+ <unit bldFile="tools/rndtools/launcher/group"/>
+ </component>
+ </collection>
+ <collection name="screengrabber" long-name="Screen Grabber" level="specific">
+ <component name="screengrabber_build" origin-model="foundation">
+ <unit bldFile="tools/rndtools/screengrabber/group"/>
+ </component>
+ </collection>
+ <collection name="stifui" long-name="STIF UI" level="generic">
+ <component name="stifui_stifui" long-name="STIF UI" origin-model="foundation">
+ <unit bldFile="tools/rndtools/stifui/stifui/group"/>
+ </component>
+ <component name="uitestserverstarter" long-name="UI Test Server Starter" origin-model="foundation">
+ <unit bldFile="tools/rndtools/stifui/uitestserverstarter/group"/>
+ </component>
+ <component unofficial="yes" name="stifui_build" long-name="STIF UI Build" origin-model="foundation">
+ <unit bldFile="tools/rndtools/stifui/group"/>
+ </component>
+ </collection>
+ <collection name="loadgen" long-name="Load Generator" level="app">
+ <component name="loadgen_build" origin-model="foundation">
+ <unit bldFile="tools/rndtools/loadgen/group"/>
+ </component>
+ </collection>
+ <collection name="perfmon" long-name="Performance Monitor" level="app">
+ <component name="perfmon_build" origin-model="foundation">
+ <unit bldFile="tools/rndtools/perfmon/group"/>
+ </component>
+ </collection>
+ <collection name="htiui" long-name="HTI UI" level="generic">
+ <!-- Empty duplicate component HtiCommPlugins removed -->
+ <!-- Empty duplicate component HtiServicePlugins removed -->
+ <component name="htidevicereboot" long-name="HTI DeviceR eboot" origin-model="foundation">
+ <unit bldFile="tools/rndtools/htiui/htidevicereboot/group"/>
+ </component>
+ <component name="htistartupwait" long-name="HTI Startup Wait" origin-model="foundation">
+ <unit bldFile="tools/rndtools/htiui/htistartupwait/group"/>
+ </component>
+ <component name="htiadmin" long-name="HTI Admin" origin-model="foundation">
+ <unit bldFile="tools/rndtools/htiui/htiadmin/group"/>
+ </component>
+ <component unofficial="yes" name="htiui_build" long-name="HTI UI Build" origin-model="foundation">
+ <unit bldFile="tools/rndtools/htiui/group"/>
+ </component>
+ </collection>
+ <collection name="memspyui" long-name="Memspy UI" level="generic">
+ <component name="memspyui_build" origin-model="foundation">
+ <unit bldFile="tools/rndtools/memspyui/group"/>
+ </component>
+ </collection>
+ </block>
<block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
<collection name="gid_pc_tool" long-name="GID PC Tool">
<component name="dbimporter" long-name="DB Importer" origin-model="foundation">