--- a/CompilerCompatibility/app/rndtools/package_definition.xml	Mon Mar 15 18:47:03 2010 +0000
+++ b/CompilerCompatibility/app/rndtools/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,64 +49,104 @@
   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="rndtools" level="services" long-name="RD tools">
-<collection name="s60">
-<component name="tools_rndtools_htiui">
-<unit bldFile="/sf/app/rndtools/htiui/group" mrp=""/>
-</component>
-<component name="rndtools">
-<unit bldFile="/sf/app/rndtools/group" mrp=""/>
-</component>
-</collection>
-</block>
+<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"/>
+     </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"/>
+     </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"/>
+     </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"/>
+     </component>
+    </collection>
+    <collection name="perfmon" long-name="Performance Monitor" level="test">
+     <!-- collection is really a component. Should move down a directory -->
+     <component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
+      <unit bldFile="/sf/app/rndtools/perfmon/group"/>
+     </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">
+      <unit bldFile="/sf/app/rndtools/screengrabber/group"/>
+     </component>
+    </collection>
+    <collection name="stifui" long-name="STIF UI" level="generic">
+     <component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
+      <unit bldFile="/sf/app/rndtools/stifui/stifui/group"/>
+     </component>
+     <component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
+      <unit bldFile="/sf/app/rndtools/stifui/uitestserverstarter/group"/>
+     </component>
+     <component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
+      <!-- can this be split up into the other components or made a ROM component? -->
+      <unit bldFile="/sf/app/rndtools/stifui/group"/>
+     </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"/>
+     </component>
+    </collection>
+    <collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
+     <component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
+      <unit bldFile="/sf/app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
+     </component>
+     <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>
+     <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>
+    </collection>
+   </block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file