# HG changeset patch
# User andy simpson <andrews@symbian.org>
# Date 1273507153 -3600
# Node ID abf2a35ddf417bc3b4a6402e3aa6bcfbb3abe014
# Parent  0239dfcfbf2a8bb798d51017683876cb7cbce791
rename overlay to prebuilt

diff -r 0239dfcfbf2a -r abf2a35ddf41 overlay/job_props.ant.xml
--- a/overlay/job_props.ant.xml	Thu Apr 29 13:24:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS" >
-    
-    <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
-    <property name="sf.project.type" value="tools" />
-
-    <property name="sf.previous.pdk.tag" value="PDK_3.0.h" />
-
-    <property name="sf.spec.job.name" value="overlay"/>
-    <property name="sf.spec.corebuildversion" value="weekxx"/>
-    
-    <property name="sf.spec.sbs.variant" value="tb92sf"/>    
-    <property name="sf.spec.sbs.config"  value="tools.whatlog,tools2.whatlog"/>
-    <property name="sf.spec.sysdef.configurations.list" value="overlay"/>
-    
-    <!-- use this in create-canonical-sysdef override  -->
-    <property name="sf.spec.systemdefinition.location" value="${sf.project.location}/sysdefs/system_model.xml"/>
-
-    <property name="sf.spec.baseline.enable"       value="false" />
-    <property name="sf.spec.toolsbaseline.enable"  value="false" />
-
-    <!-- zip all logs before publish -->
-    <property name="sf.spec.logs.zip.enable"  value="true"/>
-
-    <!-- packaging options for bin/src-->
-    <property name="sf.spec.package.bin.enable"  value="true"/>
-    <property name="sf.spec.package.src.enable"  value="true"/>
-
-    <!-- required for gt bootstrap exclusion list creation -->
-    <property name="sf.spec.dirlist.enable"      value="true"/>
-    
-    <property name="sf.spec.bldmefirst.gt.variant" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_v${sf.spec.sbs.variant}.cfg" />
-    <!-- Location of Symbian_OS.hrh changed for Symbian3 to an inc directory -->
-    <property name="sf.spec.bldmefirst.gt.hrh.os"  value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/inc/Symbian_OS_${sf.spec.sbs.variant}.hrh" />
-    <property name="sf.spec.bldmefirst.gt.hrh"     value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/" />
-
-</project>
diff -r 0239dfcfbf2a -r abf2a35ddf41 overlay/job_refs.ant.xml
--- a/overlay/job_refs.ant.xml	Thu Apr 29 13:24:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS">
-
-<!-- For a combined model GT+S60, sf.spec.os.system.definition.files must be used -->
-<path id="sf.spec.tools.system.definition.files">
-    <fileset dir="${sf.project.location}/" casesensitive="false">
-            <include name="sysdefs/system_model.xml" />
-    </fileset>
- </path>
-  
- </project>
\ No newline at end of file
diff -r 0239dfcfbf2a -r abf2a35ddf41 overlay/sources.csv
--- a/overlay/sources.csv	Thu Apr 29 13:24:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sftools/dev/build,/sftools/dev/build,branch,default,
-http://developer.symbian.org/oss/MCL/sftools/dev/hostenv/cpptoolsplat,/sftools/dev/hostenv/cpptoolsplat,branch,default,
-http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease,/sf/os/deviceplatformrelease,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv,/sf/os/kernelhwsrv,branch,RCL_3,
-http://staging.foundationhost.org/oss/MCL/sf/mw/qt,/sf/mw/qt,branch,default,
diff -r 0239dfcfbf2a -r abf2a35ddf41 overlay/sysdefs/system_model.xml
--- a/overlay/sysdefs/system_model.xml	Thu Apr 29 13:24:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-<?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="dev" long-name="dev tools" levels="tools">
-   <block name="hostenv-buildtools" level="hw" long-name="Hostenv Build Tools" levels="bld mw fw ui"> 
-    <collection name="Essential tools" long-name="Build System Tools" level="bld">
-     <component name="cpp-2.9-psion-98r2" long-name="cpp-2.9-psion-98r2" deprecated="^2" purpose="development" class="PC">
-      <unit bldFile="sftools/dev/hostenv/cpptoolsplat/cpp-2.9-psion-98r2/group" mrp="sftools/dev/hostenv/cpptoolsplat/cpp-2.9-psion-98r2/group/cpp-2.9-psion-98r2.mrp"/>
-     </component>
-     <component name="mingw-gcc-3.4.5" long-name="mingw-gcc-3.4.5" purpose="development" class="PC">
-        <unit bldFile="sftools/dev/hostenv/cpptoolsplat/mingw-gcc-3.4.5" mrp="sftools/dev/hostenv/cpptoolsplat/mingw-gcc-3.4.5/mingw-gcc-3.4.5.mrp"/>
-     </component>
-      <component name="stlport" long-name="stlport" purpose="development" class="PC">
-         <unit bldFile="sftools/dev/hostenv/cpptoolsplat/stlport/group" mrp="sftools/dev/hostenv/cpptoolsplat/stlport/group/stlport.mrp" />   
-       </component>
-     </collection>
-   </block>
-   <block name="dev-buildtools" level="hw" long-name="Dev Build Tools" levels="bld mw fw ui">
-        <collection name="bintools" level="framework" long-name="Binary Tools">
-            <component filter="build_SFPhase3" name="evalid" long-name="Evalid" >
-                <unit bldFile="sftools/dev/build/bintools/evalid" mrp="bintools/evalid/evalid.mrp"/>
-            </component>
-            <component filter="build_SFPhase1" name="rcomp" long-name="Resource Compiler" >
-                <unit bldFile="sftools/dev/build/bintools/rcomp/group" mrp="bintools/rcomp/group/rcomp.mrp"/>
-            </component>
-            <component filter="build_SFPhase1" name="checklib" long-name="checklib" >
-                <unit bldFile="sftools/dev/build/bintools/checklib/group" mrp="bintools/checklib/group/checklib.mrp"/>
-            </component>
-            <component filter="build_SFPhase1" name="elftools" long-name="elftools" >
-                <unit bldFile="sftools/dev/build/bintools/elftools/group" mrp="bintools/elftools/group/elftools.mrp"/>
-            </component>
-        </collection>
-        <collection name="srctools" level="middleware" long-name="Source Tools">
-            <component filter="build_SFPhase1" name="tranasm" long-name="tranasm" >
-                <unit bldFile="sftools/dev/build/srctools/tranasm/group" mrp="srctools/tranasm/group/tranasm.mrp"/>
-            </component>
-            <component filter="build_SFPhase1" name="cmaker" long-name="cmaker" >
-                <unit bldFile="sftools/dev/build/srctools/cmaker/group" mrp="srctools/cmaker/group/cmaker.mrp"/>
-            </component>
-        </collection>
-        <collection name="e32tools" level="middleware" long-name="E32 Tools">
-            <component filter="build_SFPhase1" name="elf2e32" long-name="elf2e32 (Postlinker)" >
-                <unit bldFile="sftools/dev/build/e32tools/elf2e32/group" mrp="e32tools/elf2e32/group/elf2e32.mrp"/>
-            </component>
-            <component filter="build_SFPhase1" name="e32lib" long-name="E32 Image Library" >
-                <unit bldFile="sftools/dev/build/e32tools/e32lib/group" mrp="e32tools/e32lib/group/e32lib.mrp"/>
-            </component>
-        </collection>
-<!--        
-        <collection name="buildtoolguides" level="ui" long-name="Build Tool Guides">
-            <component filter="build_SFPhase3" name="emulconfiguratorguide" long-name="Emulator Configurator Guide" >
-                <unit bldFile="sftools/dev/build/buildtoolguides/emulconfiguratorguide/group" mrp="buildtoolguides/emulconfiguratorguide/group/emulbuilderguide.mrp"/>
-            </component>
-            <component filter="build_SFPhase3" name="romtoolsguide" long-name="ROM Tools Guide" >
-                <unit bldFile="sftools/dev/build/buildtoolguides/romtoolsguide/group" mrp="buildtoolguides/romtoolsguide/group/romtoolsguide.mrp"/>
-            </component>
-            <component filter="build_SFPhase3" name="sbsv2guide" long-name="SBSv2 Guide" >
-                <unit bldFile="sftools/dev/build/buildtoolguides/sbsv2guide/group" mrp="buildtoolguides/sbsv2guide/group/sbsv2guide.mrp"/>
-            </component>
-        </collection>
--->        
-        <collection name="sbsv2" level="middleware" long-name="Symbian Build System v2">
-            <component filter="build_SFPhase3" name="cpp-raptor" long-name="CPP (Raptor)" >
-                <unit bldFile="sftools/dev/build/sbsv2/cpp-raptor/group" mrp="sbsv2/cpp-raptor/group/cpp-raptor.mrp"/>
-            </component>
-            <component filter="build_SFPhase3" name="pvmgmake" long-name="PVM Gmake" >
-                <unit bldFile="sftools/dev/build/sbsv2/pvmgmake/group" mrp="sbsv2/pvmgmake/group/pvmgmake.mrp"/>
-            </component>
-            <component filter="build_SFPhase3" name="raptor" long-name="SBSv2 (Raptor)" >
-                <unit bldFile="sftools/dev/build/sbsv2/raptor/group" mrp="sbsv2/raptor/group/raptor.mrp"/>
-            </component>
-        </collection>
-        <collection name="imgtools" level="framework" long-name="Image Tools">
-            <component filter="build_SFPhase3" name="romtools" long-name="ROM Tools" >
-                <unit bldFile="sftools/dev/build/imgtools/romtools/group" mrp="imgtools/romtools/group/romtools.mrp"/>
-            </component>
-            <component filter="build_SFPhase3" name="buildrom" long-name="Build ROM" >
-                <unit bldFile="sftools/dev/build/imgtools/buildrom/group" mrp="imgtools/buildrom/group/buildrom.mrp"/>
-            </component>
-            <component filter="build_SFPhase1" name="imglib" long-name="ROM/ROFS Image Library" >
-                <unit bldFile="sftools/dev/build/imgtools/imglib/group" mrp="imgtools/imglib/group/imglib.mrp"/>
-            </component>
-            <component filter="build_SFPhase3" name="sisutils" long-name="SIS Utility Library" >
-                <unit bldFile="sftools/dev/build/imgtools/sisutils/group" mrp="imgtools/sisutils/group/sisutils.mrp"/>
-            </component>
-            <component filter="build_SFPhase2" name="imgcheck" long-name="Image Checker" >
-                <unit bldFile="sftools/dev/build/imgtools/imgcheck/group" mrp="imgtools/imgcheck/group/imgcheck.mrp"/>
-            </component>
-            <component filter="build_SFPhase2" name="imaker" long-name="Imaker" >
-                <unit bldFile="sftools/dev/build/imgtools/imaker/group" mrp="imgtools/imaker/group/imaker.mrp"/>
-            </component>
-        </collection>
-        <collection name="build_info" long-name="Build Info" level="ui">
-          <component name="build_metadata" long-name="Build Metadata" filter="build_SFPhase3">
-            <unit mrp="build_info/build_metadata/build_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>  
-      <block name="qt" level="generic" long-name="Qt" levels="tool mw app">
-        <collection name="qtconf" long-name="Qt Config" level="tool">
-          <component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
-            <unit bldFile="sf/mw/qt/src/s60installs/deviceconfiguration"/>
-          </component>
-        </collection>
-      </block>
-     </layer>
- </systemModel>
-</SystemDefinition>
diff -r 0239dfcfbf2a -r abf2a35ddf41 prebuilt/job_props.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/prebuilt/job_props.ant.xml	Mon May 10 16:59:13 2010 +0100
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<project name="SF-JOB-PROPS" >
+    
+    <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
+    <property name="sf.project.type" value="tools" />
+
+    <property name="sf.previous.pdk.tag" value="PDK_3.0.h" />
+
+    <property name="sf.spec.job.name" value="overlay"/>
+    <property name="sf.spec.corebuildversion" value="weekxx"/>
+    
+    <property name="sf.spec.sbs.variant" value="tb92sf"/>    
+    <property name="sf.spec.sbs.config"  value="tools.whatlog,tools2.whatlog"/>
+    <property name="sf.spec.sysdef.configurations.list" value="overlay"/>
+    
+    <!-- use this in create-canonical-sysdef override  -->
+    <property name="sf.spec.systemdefinition.location" value="${sf.project.location}/sysdefs/system_model.xml"/>
+
+    <property name="sf.spec.baseline.enable"       value="false" />
+    <property name="sf.spec.toolsbaseline.enable"  value="false" />
+
+    <!-- zip all logs before publish -->
+    <property name="sf.spec.logs.zip.enable"  value="true"/>
+
+    <!-- packaging options for bin/src-->
+    <property name="sf.spec.package.bin.enable"  value="true"/>
+    <property name="sf.spec.package.src.enable"  value="true"/>
+
+    <!-- required for gt bootstrap exclusion list creation -->
+    <property name="sf.spec.dirlist.enable"      value="true"/>
+    
+    <property name="sf.spec.bldmefirst.gt.variant" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_v${sf.spec.sbs.variant}.cfg" />
+    <!-- Location of Symbian_OS.hrh changed for Symbian3 to an inc directory -->
+    <property name="sf.spec.bldmefirst.gt.hrh.os"  value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/inc/Symbian_OS_${sf.spec.sbs.variant}.hrh" />
+    <property name="sf.spec.bldmefirst.gt.hrh"     value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/" />
+
+</project>
diff -r 0239dfcfbf2a -r abf2a35ddf41 prebuilt/job_refs.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/prebuilt/job_refs.ant.xml	Mon May 10 16:59:13 2010 +0100
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+
+<project name="SF-JOB-REFS">
+
+<!-- For a combined model GT+S60, sf.spec.os.system.definition.files must be used -->
+<path id="sf.spec.tools.system.definition.files">
+    <fileset dir="${sf.project.location}/" casesensitive="false">
+            <include name="sysdefs/system_model.xml" />
+    </fileset>
+ </path>
+  
+ </project>
\ No newline at end of file
diff -r 0239dfcfbf2a -r abf2a35ddf41 prebuilt/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/prebuilt/sources.csv	Mon May 10 16:59:13 2010 +0100
@@ -0,0 +1,6 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/MCL/sftools/dev/build,/sftools/dev/build,branch,default,
+http://developer.symbian.org/oss/MCL/sftools/dev/hostenv/cpptoolsplat,/sftools/dev/hostenv/cpptoolsplat,branch,default,
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease,/sf/os/deviceplatformrelease,branch,RCL_3,
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv,/sf/os/kernelhwsrv,branch,RCL_3,
+http://staging.foundationhost.org/oss/MCL/sf/mw/qt,/sf/mw/qt,branch,default,
diff -r 0239dfcfbf2a -r abf2a35ddf41 prebuilt/sysdefs/system_model.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/prebuilt/sysdefs/system_model.xml	Mon May 10 16:59:13 2010 +0100
@@ -0,0 +1,175 @@
+<?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="dev" long-name="dev tools" levels="tools">
+   <block name="hostenv-buildtools" level="hw" long-name="Hostenv Build Tools" levels="bld mw fw ui"> 
+    <collection name="Essential tools" long-name="Build System Tools" level="bld">
+     <component name="cpp-2.9-psion-98r2" long-name="cpp-2.9-psion-98r2" deprecated="^2" purpose="development" class="PC">
+      <unit bldFile="sftools/dev/hostenv/cpptoolsplat/cpp-2.9-psion-98r2/group" mrp="sftools/dev/hostenv/cpptoolsplat/cpp-2.9-psion-98r2/group/cpp-2.9-psion-98r2.mrp"/>
+     </component>
+     <component name="mingw-gcc-3.4.5" long-name="mingw-gcc-3.4.5" purpose="development" class="PC">
+        <unit bldFile="sftools/dev/hostenv/cpptoolsplat/mingw-gcc-3.4.5" mrp="sftools/dev/hostenv/cpptoolsplat/mingw-gcc-3.4.5/mingw-gcc-3.4.5.mrp"/>
+     </component>
+      <component name="stlport" long-name="stlport" purpose="development" class="PC">
+         <unit bldFile="sftools/dev/hostenv/cpptoolsplat/stlport/group" mrp="sftools/dev/hostenv/cpptoolsplat/stlport/group/stlport.mrp" />   
+       </component>
+     </collection>
+   </block>
+   <block name="dev-buildtools" level="hw" long-name="Dev Build Tools" levels="bld mw fw ui">
+        <collection name="bintools" level="framework" long-name="Binary Tools">
+            <component filter="build_SFPhase3" name="evalid" long-name="Evalid" >
+                <unit bldFile="sftools/dev/build/bintools/evalid" mrp="bintools/evalid/evalid.mrp"/>
+            </component>
+            <component filter="build_SFPhase1" name="rcomp" long-name="Resource Compiler" >
+                <unit bldFile="sftools/dev/build/bintools/rcomp/group" mrp="bintools/rcomp/group/rcomp.mrp"/>
+            </component>
+            <component filter="build_SFPhase1" name="checklib" long-name="checklib" >
+                <unit bldFile="sftools/dev/build/bintools/checklib/group" mrp="bintools/checklib/group/checklib.mrp"/>
+            </component>
+            <component filter="build_SFPhase1" name="elftools" long-name="elftools" >
+                <unit bldFile="sftools/dev/build/bintools/elftools/group" mrp="bintools/elftools/group/elftools.mrp"/>
+            </component>
+        </collection>
+        <collection name="srctools" level="middleware" long-name="Source Tools">
+            <component filter="build_SFPhase1" name="tranasm" long-name="tranasm" >
+                <unit bldFile="sftools/dev/build/srctools/tranasm/group" mrp="srctools/tranasm/group/tranasm.mrp"/>
+            </component>
+            <component filter="build_SFPhase1" name="cmaker" long-name="cmaker" >
+                <unit bldFile="sftools/dev/build/srctools/cmaker/group" mrp="srctools/cmaker/group/cmaker.mrp"/>
+            </component>
+        </collection>
+        <collection name="e32tools" level="middleware" long-name="E32 Tools">
+            <component filter="build_SFPhase1" name="elf2e32" long-name="elf2e32 (Postlinker)" >
+                <unit bldFile="sftools/dev/build/e32tools/elf2e32/group" mrp="e32tools/elf2e32/group/elf2e32.mrp"/>
+            </component>
+            <component filter="build_SFPhase1" name="e32lib" long-name="E32 Image Library" >
+                <unit bldFile="sftools/dev/build/e32tools/e32lib/group" mrp="e32tools/e32lib/group/e32lib.mrp"/>
+            </component>
+        </collection>
+<!--        
+        <collection name="buildtoolguides" level="ui" long-name="Build Tool Guides">
+            <component filter="build_SFPhase3" name="emulconfiguratorguide" long-name="Emulator Configurator Guide" >
+                <unit bldFile="sftools/dev/build/buildtoolguides/emulconfiguratorguide/group" mrp="buildtoolguides/emulconfiguratorguide/group/emulbuilderguide.mrp"/>
+            </component>
+            <component filter="build_SFPhase3" name="romtoolsguide" long-name="ROM Tools Guide" >
+                <unit bldFile="sftools/dev/build/buildtoolguides/romtoolsguide/group" mrp="buildtoolguides/romtoolsguide/group/romtoolsguide.mrp"/>
+            </component>
+            <component filter="build_SFPhase3" name="sbsv2guide" long-name="SBSv2 Guide" >
+                <unit bldFile="sftools/dev/build/buildtoolguides/sbsv2guide/group" mrp="buildtoolguides/sbsv2guide/group/sbsv2guide.mrp"/>
+            </component>
+        </collection>
+-->        
+        <collection name="sbsv2" level="middleware" long-name="Symbian Build System v2">
+            <component filter="build_SFPhase3" name="cpp-raptor" long-name="CPP (Raptor)" >
+                <unit bldFile="sftools/dev/build/sbsv2/cpp-raptor/group" mrp="sbsv2/cpp-raptor/group/cpp-raptor.mrp"/>
+            </component>
+            <component filter="build_SFPhase3" name="pvmgmake" long-name="PVM Gmake" >
+                <unit bldFile="sftools/dev/build/sbsv2/pvmgmake/group" mrp="sbsv2/pvmgmake/group/pvmgmake.mrp"/>
+            </component>
+            <component filter="build_SFPhase3" name="raptor" long-name="SBSv2 (Raptor)" >
+                <unit bldFile="sftools/dev/build/sbsv2/raptor/group" mrp="sbsv2/raptor/group/raptor.mrp"/>
+            </component>
+        </collection>
+        <collection name="imgtools" level="framework" long-name="Image Tools">
+            <component filter="build_SFPhase3" name="romtools" long-name="ROM Tools" >
+                <unit bldFile="sftools/dev/build/imgtools/romtools/group" mrp="imgtools/romtools/group/romtools.mrp"/>
+            </component>
+            <component filter="build_SFPhase3" name="buildrom" long-name="Build ROM" >
+                <unit bldFile="sftools/dev/build/imgtools/buildrom/group" mrp="imgtools/buildrom/group/buildrom.mrp"/>
+            </component>
+            <component filter="build_SFPhase1" name="imglib" long-name="ROM/ROFS Image Library" >
+                <unit bldFile="sftools/dev/build/imgtools/imglib/group" mrp="imgtools/imglib/group/imglib.mrp"/>
+            </component>
+            <component filter="build_SFPhase3" name="sisutils" long-name="SIS Utility Library" >
+                <unit bldFile="sftools/dev/build/imgtools/sisutils/group" mrp="imgtools/sisutils/group/sisutils.mrp"/>
+            </component>
+            <component filter="build_SFPhase2" name="imgcheck" long-name="Image Checker" >
+                <unit bldFile="sftools/dev/build/imgtools/imgcheck/group" mrp="imgtools/imgcheck/group/imgcheck.mrp"/>
+            </component>
+            <component filter="build_SFPhase2" name="imaker" long-name="Imaker" >
+                <unit bldFile="sftools/dev/build/imgtools/imaker/group" mrp="imgtools/imaker/group/imaker.mrp"/>
+            </component>
+        </collection>
+        <collection name="build_info" long-name="Build Info" level="ui">
+          <component name="build_metadata" long-name="Build Metadata" filter="build_SFPhase3">
+            <unit mrp="build_info/build_metadata/build_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>  
+      <block name="qt" level="generic" long-name="Qt" levels="tool mw app">
+        <collection name="qtconf" long-name="Qt Config" level="tool">
+          <component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
+            <unit bldFile="sf/mw/qt/src/s60installs/deviceconfiguration"/>
+          </component>
+        </collection>
+      </block>
+     </layer>
+ </systemModel>
+</SystemDefinition>