diff -r 0b761d12ae12 -r 262790aa488d symbian3/mw/uitools/package_definition.xml
--- a/symbian3/mw/uitools/package_definition.xml	Mon Feb 01 16:11:43 2010 +0000
+++ b/symbian3/mw/uitools/package_definition.xml	Tue Feb 02 19:53:24 2010 +0000
@@ -1,109 +1,134 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!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>
- <!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>
- <!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">
-<systemModel>
-<layer name="mw">
-<block name="uitools">
-<collection name="s60">
-<component name="uitools">
-<unit bldFile="/sf/mw/uitools/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!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^3" schema="2.0.1">
+  <systemModel>
+    <layer name="mw" long-name="Middleware" levels="generic specific">
+      <block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
+        <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
+          <!-- collection is actually a component. Needs to be moved down a directory -->
+          <component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
+            <unit bldFile="/sf/mw/uitools/cdlcompilertoolkit/group"/>
+          </component>
+        </collection>
+        <collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
+          <!-- collection is actually a component. Needs to be moved down a directory -->
+          <component name="cdlcompiler_build" filter="s60" long-name="CDL Compiler Build">
+            <unit bldFile="/sf/mw/uitools/cdlcompiler/group"/>
+          </component>
+        </collection>
+        <collection name="gfxtools" long-name="Graphics Tools" level="tool">
+          <component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
+            <unit bldFile="/sf/mw/uitools/gfxtools/gditools/group"/>
+          </component>
+          <component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
+            <unit bldFile="/sf/mw/uitools/gfxtools/color/group"/>
+          </component>
+        </collection>
+        <collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
+          <!-- collection is actually a component. Needs to be moved down a directory -->
+          <component name="aknlayoutcompiler_build" filter="s60" long-name="Avkon Layout Compiler Build">
+            <unit bldFile="/sf/mw/uitools/aknlayoutcompiler/group"/>
+          </component>
+        </collection>
+        <collection name="skincompiler" long-name="Skin Compiler" level="compile">
+          <component name="aknskindesccompiler" filter="s60" long-name="Avkon Skin Descriptor Compiler">
+            <unit bldFile="/sf/mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
+          </component>
+        </collection>
+        <collection name="reszip" long-name="Resource Zip" level="encode">
+          <!-- collection is actually a component. Needs to be moved down a directory -->
+          <component name="reszip_build" filter="s60" long-name="Resource Zip Build">
+            <unit bldFile="/sf/mw/uitools/reszip/group"/>
+          </component>
+        </collection>
+        <collection name="toollibraries" long-name="Tool Libraries" level="tool"/>
+        <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
+          <component name="svgtenc" filter="s60" long-name="Standalone SVGT Encoder" class="PC">
+            <unit bldFile="/sf/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
+          </component>
+        </collection>
+        <collection name="uitools_info" long-name="UI Tools Info" level="if">
+          <component name="uitools_plat" filter="s60" long-name="UI Tools Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/uitools/uitools_plat/group"/>
+          </component>
+          <component name="uitools_pub" filter="s60" long-name="UI Tools Public Interfaces" class="api">
+            <unit bldFile="/sf/mw/uitools/uitools_pub/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
 </SystemDefinition>