--- a/symbian4/app/rndtools/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
@@ -50,41 +50,32 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="rndtools" level="services" long-name="R&amp;D tools" levels="support generic test util">
 <collection name="creator" long-name="Creator" level="support">
 <!-- collection is really a component. Should move down a directory -->
 <component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="/sf/app/rndtools/creator/group"/>
+<unit bldFile="/sf/app/rndtools/creator" proFile="creator.pro"/>
 </component>
 </collection>
 <collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="/sf/app/rndtools/filebrowser/group"/>
+<!-- collection is really a component. Should move down a directory -->
+<component name="filebrowser_build" filter="s60" long-name="File Browser Build" purpose="development" class="tool">
+<unit bldFile="/sf/app/rndtools/filebrowser" proFile="filebrowser.pro"/>
 </component>
 </collection>
 <collection name="launcher" long-name="Launcher" level="util">
 <!-- collection is really a component. Should move down a directory -->
 <component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="/sf/app/rndtools/launcher/group"/>
+<unit bldFile="/sf/app/rndtools/launcher" proFile="launcher.pro"/>
 </component>
 </collection>
 <collection name="loadgen" long-name="Load Generator" level="test">
 <!-- collection is really a component. Should move down a directory -->
 <component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="/sf/app/rndtools/loadgen/group"/>
+<unit bldFile="/sf/app/rndtools/loadgen" proFile="loadgen.pro"/>
 </component>
 </collection>
 <collection name="perfmon" long-name="Performance Monitor" level="test">
@@ -93,6 +84,12 @@
 <unit bldFile="/sf/app/rndtools/perfmon" proFile="perfmon.pro"/>
 </component>
 </collection>
+<collection name="piprofilerui" long-name="Performance Investigator Profiler UI" level="generic">
+<!-- collection is really a component. Should move down a directory -->
+<component name="piprofilerui_build" filter="s60" long-name="Performance Investigator Profiler UI Build" purpose="development" introduced="^4">
+<unit bldFile="/sf/app/rndtools/piprofilerui" proFile="piprofilerui.pro"/>
+</component>
+</collection>
 <collection name="screengrabber" long-name="Screen Grabber" level="util">
 <!-- collection is really a component. Should move down a directory -->
 <component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
@@ -100,43 +97,24 @@
 </component>
 </collection>
 <collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_avkon" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="/sf/app/rndtools/stifui/avkon/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="/sf/app/rndtools/stifui/uitestserverstarter/group"/>
+<component name="stifuiqt" filter="s60" long-name="STIF Qt UI" purpose="development" introduced="^4">
+<unit bldFile="/sf/app/rndtools/stifui/qt" proFile="stifqtui.pro"/>
+<!-- should use stifuiqt as the dir name -->
 </component>
 </collection>
 <collection name="memspyui" long-name="Memspy UI" level="generic">
 <!-- collection is really a component. Should move down a directory -->
 <component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="/sf/app/rndtools/memspyui/group"/>
+<unit bldFile="/sf/app/rndtools/memspyui" proFile="memspyui.pro"/>
 </component>
 </collection>
 <collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
+<!-- should split up into individual components -->
+<unit bldFile="/sf/app/rndtools/htiui/group"/>
 </component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="/sf/app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="/sf/app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="/sf/app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="/sf/app/rndtools/htiui/group"/>
+<component name="htiadminqt" filter="s60" long-name="HTI Admin Qt" purpose="development">
+<unit bldFile="/sf/app/rndtools/htiui/htiadminqt" proFile="HtiAdmin.pro"/>
 </component>
 </collection>
 </block>