diff -r e9ebcfcb4702 -r 30e67220bf86 symbian3/os/buildtools/package_definition.xml
--- a/symbian3/os/buildtools/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/os/buildtools/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,125 +1,47 @@
 <?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
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
-        <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-          <component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
-            <unit mrp="/sf/os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
-          </component>
-          <component name="commonbldutils" long-name="Common Utils" purpose="development">
-            <unit mrp="/sf/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-          </component>
-        </collection>
-        <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-          <component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
-            <unit mrp="/sf/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-          </component>
-          <component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
-            <unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-          </component>
-          <component name="wintunnel" long-name="Wintunnel" purpose="development" filter="test">
-            <unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="/sf/os/buildtools/toolsandutils/wintunnel/group"/>
-          </component>
-          <component name="autotest" long-name="Autotest" purpose="development">
-            <unit bldFile="/sf/os/buildtools/toolsandutils/autotest/group" mrp="/sf/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-          </component>
-        </collection>
-        <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-          <component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
-            <unit mrp="/sf/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="/sf/os/buildtools/sbsv1_os/e32toolp/group"/>
-          </component>
-        </collection>
-        <collection name="imgtools_os" long-name="Image Tools" level="fw">
-          <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="^2" purpose="development">
-            <unit bldFile="/sf/os/buildtools/imgtools_os/romkiteka2/group" mrp="/sf/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-          </component>
-        </collection>
-        <collection name="misccomponents" long-name="Misc Components" level="mw">
-          <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
-            <unit bldFile="/sf/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/sf/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-          </component>
-        </collection>
-        <collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-          <component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="buildtools" name="Build Tools" levels="bld mw fw ui">
+    <collection id="bldsystemtools" name="Build System Tools" level="bld">
+      <component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
+        <unit mrp="bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+      </component>
+      <component id="commonbldutils" name="Common Utils" purpose="development">
+        <unit mrp="bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+      </component>
+    </collection>
+    <collection id="toolsandutils" name="Tools and Utils" level="mw">
+      <component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
+        <unit mrp="toolsandutils/productionbldtools/product_tools.mrp"/>
+      </component>
+      <component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
+        <unit bldFile="toolsandutils/e32tools/group" mrp="toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+      </component>
+      <component id="wintunnel" name="Wintunnel" purpose="development" filter="test">
+        <unit mrp="toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="toolsandutils/wintunnel/group"/>
+      </component>
+      <component id="autotest" name="Autotest" purpose="development">
+        <unit bldFile="toolsandutils/autotest/group" mrp="toolsandutils/autotest/group/tools_autotest.mrp"/>
+      </component>
+    </collection>
+    <collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
+      <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="sf_build">
+        <unit mrp="sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="sbsv1_os/e32toolp/group"/>
+      </component>
+	 </collection>
+	 <collection id="imgtools_os" name="Image Tools" level="fw">
+      <component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
+        <unit bldFile="imgtools_os/romkiteka2/group" mrp="imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+      </component>
+    </collection>
+    <collection id="misccomponents" name="Misc Components" level="mw">
+      <component id="emulatorlauncher" name="Emulator Launcher" filter="gt" purpose="development">
+        <unit bldFile="misccomponents/emulatorlauncher/group" mrp="misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+      </component>
+    </collection>
+    <collection id="buildtools_info" name="Build Tools Info" level="ui">
+      <component id="buildtools_metadata" name="Build Tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>