diff -r 1553c141c99f -r 5dfc4b38cad0 3k/os/buildtools/package_definition.xml
--- a/3k/os/buildtools/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/os/buildtools/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" 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">
@@ -20,7 +20,7 @@
      </component>
     </collection>
     <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-     <component unofficial="yes" name="buildsystem" origin-model="Foundation">
+     <component unofficial="yes" name="buildsystem" origin-model="foundation">
       <!-- <unit bldFile="os/buildtools/toolsandutils/buildsystem/test/helloworld"/> -->
       <!-- <unit bldFile="os/buildtools/toolsandutils/buildsystem/test/binaryvariation"/> -->
      </component>
@@ -31,22 +31,27 @@
       <unit mrp="/sf/os/buildtools/toolsandutils/ctsfunctionalitycheckers/Group/testtools_cts_functionalitycheckers.mrp"/>
      </component>
      <component name="n:burtestserver" long-name="BUR Test Server" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/burtestserver/Group" mrp="/sf/os/buildtools/toolsandutils/burtestserver/Group/testtools_burtestserver.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/burtestserver/Group" mrp="os/buildtools/toolsandutils/burtestserver/Group/testtools_burtestserver.mrp"/> -->
      </component>
      <component name="n:cbrtools" long-name="Component Based Release (CBR) Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/cbrtools/group" mrp="/sf/os/buildtools/toolsandutils/cbrtools/group/tools_cbr_tools.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/cbrtools/group" mrp="os/buildtools/toolsandutils/cbrtools/group/tools_cbr_tools.mrp"/> -->
      </component>
      <component name="n:prf" long-name="Product Realisation Framework" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/prf/group" mrp="/sf/os/buildtools/toolsandutils/prf/group/tools_cbr_prf.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/prf/group" mrp="os/buildtools/toolsandutils/prf/group/tools_cbr_prf.mrp"/> -->
      </component>
      <component name="n:cdb" long-name="Code Database" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/cdb/group" mrp="/sf/os/buildtools/toolsandutils/cdb/group/testtools_cdb.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/cdb/group" mrp="os/buildtools/toolsandutils/cdb/group/testtools_cdb.mrp"/> -->
      </component>
      <component name="e32tools" long-name="E32 Tools" deprecated="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
      </component>
      <component name="n:kitcomparator" long-name="Kit Comparator" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/kitcomparator/group" mrp="/sf/os/buildtools/toolsandutils/kitcomparator/group/testtools_cts_kitcomparator.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/kitcomparator/group" mrp="os/buildtools/toolsandutils/kitcomparator/group/testtools_cts_kitcomparator.mrp"/> -->
      </component>
      <component name="wincredistribution" long-name="WinC Redistribution" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp"/>
@@ -55,34 +60,41 @@
       <unit mrp="/sf/os/buildtools/perltoolsplat_os/redistribution/additional_tools.mrp"/>
      </component>
      <component name="n:testdriver" long-name="Test Driver" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/testdriver/Group" mrp="/sf/os/buildtools/toolsandutils/testdriver/Group/testtools_testdriver.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/testdriver/Group" mrp="os/buildtools/toolsandutils/testdriver/Group/testtools_testdriver.mrp"/> -->
      </component>
      <component name="statapi" long-name="STAT API" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="/sf/os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/> -->
      </component>
      <component name="n:statsource" long-name="STAT Source" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/toolsandutils/statsource/group/testtools_stat_common_source.mrp"/>
      </component>
      <component name="n:statdesktop" long-name="STAT Desktop" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/statdesktop/group" mrp="/sf/os/buildtools/toolsandutils/statdesktop/group/testtools_stat_desktop.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/statdesktop/group" mrp="os/buildtools/toolsandutils/statdesktop/group/testtools_stat_desktop.mrp"/> -->
      </component>
      <component name="n:systemmonitor" long-name="System Monitor" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/systemmonitor/group" mrp="/sf/os/buildtools/toolsandutils/systemmonitor/group/testtools_systemmonitor.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/systemmonitor/group" mrp="os/buildtools/toolsandutils/systemmonitor/group/testtools_systemmonitor.mrp"/> -->
      </component>
      <component name="n:testtoolsdesktop" long-name="Test Tools Desktop" filter="gt" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="/sf/os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/> -->
      </component>
      <component name="wintunnel" long-name="Wintunnel" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp"/>
      </component>
      <component name="n:usecasecontroller" long-name="Use Case Controller" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group" mrp="/sf/os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group/testtools_ucc.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group" mrp="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group/testtools_ucc.mrp"/> -->
      </component>
      <component name="autotest" long-name="Autotest" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/buildtools/toolsandutils/autotest/group" mrp="/sf/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
      </component>
      <component name="n:testconfigfileparser" long-name="Test Config File Parser" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/testconfigfileparser/group" mrp="/sf/os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/testconfigfileparser/group" mrp="os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/> -->
      </component>
      <component name="n:kitsetupapp" long-name="Kit Setup App" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/toolsandutils/kitsetupapp/group/tools_devkits_kitsetupapp.mrp"/>
@@ -91,10 +103,12 @@
       <unit mrp="/sf/os/buildtools/toolsandutils/navigationpages/tools_sdk_eng_NavigationPages.mrp"/>
      </component>
      <component name="n:productinstaller" long-name="Product Installer" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/productinstaller/group" mrp="/sf/os/buildtools/toolsandutils/productinstaller/group/tools_custkits_productinstaller.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/productinstaller/group" mrp="os/buildtools/toolsandutils/productinstaller/group/tools_custkits_productinstaller.mrp"/> -->
      </component>
      <component name="n:stlport" long-name="STL Port" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/stlport/group" mrp="/sf/os/buildtools/toolsandutils/stlport/group/tools_stlport.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/toolsandutils/stlport/group" mrp="os/buildtools/toolsandutils/stlport/group/tools_stlport.mrp"/> -->
      </component>
     </collection>
    <collection name="n:dist_os" long-name="Redistribution" level="mw">
@@ -104,21 +118,26 @@
     </collection>
     <collection name="n:bintools_os" long-name="Binary Tools" level="fw">
      <component name="n:rcomp" long-name="Resource Compiler" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/bintools_os/rcomp/group" mrp="/sf/os/buildtools/bintools_os/rcomp/group/tools_rcomp.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/bintools_os/rcomp/group" mrp="os/buildtools/bintools_os/rcomp/group/tools_rcomp.mrp"/> -->
      </component>
      <component name="n:evalid" long-name="Evalid" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/bintools_os/evalid" mrp="/sf/os/buildtools/bintools_os/evalid/tools_evalid.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/bintools_os/evalid" mrp="os/buildtools/bintools_os/evalid/tools_evalid.mrp"/> -->
      </component>
     </collection>
     <collection name="n:perltoolsplat_os" long-name="Perl Tools Platform" level="mw">
      <component name="n:redistribution" long-name="Redistribution" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/perltoolsplat_os/redistribution" mrp="/sf/os/buildtools/perltoolsplat_os/redistribution/tools_redistribution_common.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/perltoolsplat_os/redistribution" mrp="os/buildtools/perltoolsplat_os/redistribution/tools_redistribution_common.mrp"/> -->
      </component>
      <component name="n:legacycommonperl" long-name="Legacy Common Perl Libraries" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/perltoolsplat_os/legacycommonperl/group" mrp="/sf/os/buildtools/perltoolsplat_os/legacycommonperl/group/tools_sdk_eng_perllibrary.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/perltoolsplat_os/legacycommonperl/group" mrp="os/buildtools/perltoolsplat_os/legacycommonperl/group/tools_sdk_eng_perllibrary.mrp"/> -->
      </component>
      <component name="n:commonperl" long-name="Common Perl Libraries" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/perltoolsplat_os/commonperl/group" mrp="/sf/os/buildtools/perltoolsplat_os/commonperl/group/tools_sdk_eng_perl_shared.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/perltoolsplat_os/commonperl/group" mrp="os/buildtools/perltoolsplat_os/commonperl/group/tools_sdk_eng_perl_shared.mrp"/> -->
      </component>
     </collection>
     <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
@@ -126,18 +145,22 @@
       <unit bldFile="/sf/os/buildtools/sbsv1_os/e32toolp/group" mrp="/sf/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp"/>
      </component>
      <component name="n:bldtools" long-name="Build Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/sbsv1_os/bldtools/group" mrp="/sf/os/buildtools/sbsv1_os/bldtools/group/tools_sdk_eng_build-tools.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/sbsv1_os/bldtools/group" mrp="os/buildtools/sbsv1_os/bldtools/group/tools_sdk_eng_build-tools.mrp"/> -->
      </component>
     </collection>
     <collection name="n:srcanamdw_os" long-name="Source Analysis Middleware" level="fw">
      <component name="n:leavescan" long-name="Leavescan" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/srcanamdw_os/leavescan/group" mrp="/sf/os/buildtools/srcanamdw_os/leavescan/group/testtools_leavescan.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/srcanamdw_os/leavescan/group" mrp="os/buildtools/srcanamdw_os/leavescan/group/testtools_leavescan.mrp"/> -->
      </component>
      <component name="n:programchecker" long-name="Program Checker" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/srcanamdw_os/programchecker/group" mrp="/sf/os/buildtools/srcanamdw_os/programchecker/group/testtools_programchecker.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/srcanamdw_os/programchecker/group" mrp="os/buildtools/srcanamdw_os/programchecker/group/testtools_programchecker.mrp"/> -->
      </component>
      <component name="n:migrationtool" long-name="Migration Tool" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/srcanamdw_os/migrationtool/group" mrp="/sf/os/buildtools/srcanamdw_os/migrationtool/group/testtools_migrationtool.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/srcanamdw_os/migrationtool/group" mrp="os/buildtools/srcanamdw_os/migrationtool/group/testtools_migrationtool.mrp"/> -->
      </component>
     </collection>
     <collection name="imgtools_os" long-name="Image Tools" level="fw">
@@ -147,15 +170,18 @@
     </collection>
     <collection name="n:binanamdw_os" long-name="Binary Analysis Middleware" level="fw">
      <component name="n:captools" long-name="Capability Tools" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/binanamdw_os/captools/group" mrp="/sf/os/buildtools/binanamdw_os/captools/group/testtools_captools.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/binanamdw_os/captools/group" mrp="os/buildtools/binanamdw_os/captools/group/testtools_captools.mrp"/> -->
      </component>
      <component name="n:depcheck" long-name="Dependency Checker" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/binanamdw_os/depcheck" mrp="/sf/os/buildtools/binanamdw_os/depcheck/tools_depcheck.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/binanamdw_os/depcheck" mrp="os/buildtools/binanamdw_os/depcheck/tools_depcheck.mrp"/> -->
      </component>
     </collection>
     <collection name="n:devlib" long-name="Developer Library" level="ui">
      <component name="n:devlibhelp" long-name="Developer Library Help" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/devlib/devlibhelp/group/devlib94" mrp="/sf/os/buildtools/devlib/devlibhelp/group/devlib94/developerlibrary_doc_html.mrp" version="9.4"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/devlib/devlibhelp/group/devlib94" mrp="os/buildtools/devlib/devlibhelp/group/devlib94/developerlibrary_doc_html.mrp" version="9.4"/> -->
      </component>
      <component name="n:toolsdocs" long-name="Tools Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/devlib/toolsdocs/tools_documentation.mrp"/>
@@ -163,98 +189,127 @@
     </collection>
     <collection name="misccomponents" long-name="Misc Components" level="mw">
      <component name="n:runperl" long-name="Run PERL" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/runperl/group" mrp="/sf/os/buildtools/misccomponents/runperl/group/tools_sdk_eng_runperl.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/runperl/group" mrp="os/buildtools/misccomponents/runperl/group/tools_sdk_eng_runperl.mrp"/> -->
      </component>
      <component name="n:assertion" long-name="Assertion" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/assertion/group" mrp="/sf/os/buildtools/misccomponents/assertion/group/tools_sdk_eng_assertion.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/assertion/group" mrp="os/buildtools/misccomponents/assertion/group/tools_sdk_eng_assertion.mrp"/> -->
      </component>
      <component name="n:enum" long-name="Enum" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/enum/group" mrp="/sf/os/buildtools/misccomponents/enum/group/tools_sdk_eng_enum.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/enum/group" mrp="os/buildtools/misccomponents/enum/group/tools_sdk_eng_enum.mrp"/> -->
      </component>
      <component name="n:logger" long-name="Logger" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/logger/group" mrp="/sf/os/buildtools/misccomponents/logger/group/tools_sdk_eng_logger.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/logger/group" mrp="os/buildtools/misccomponents/logger/group/tools_sdk_eng_logger.mrp"/> -->
      </component>
      <component name="n:filesys" long-name="Filesys" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/filesys/group" mrp="/sf/os/buildtools/misccomponents/filesys/group/tools_sdk_eng_filesys.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/filesys/group" mrp="os/buildtools/misccomponents/filesys/group/tools_sdk_eng_filesys.mrp"/> -->
      </component>
      <component name="n:envvar" long-name="Envvar" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/envvar/group" mrp="/sf/os/buildtools/misccomponents/envvar/group/tools_sdk_eng_envvar.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/envvar/group" mrp="os/buildtools/misccomponents/envvar/group/tools_sdk_eng_envvar.mrp"/> -->
      </component>
      <component name="n:installutils" long-name="Install Utils" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/installutils/group" mrp="/sf/os/buildtools/misccomponents/installutils/group/tools_sdk_eng_installutils.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/installutils/group" mrp="os/buildtools/misccomponents/installutils/group/tools_sdk_eng_installutils.mrp"/> -->
      </component>
      <component name="n:mnemonicfix" long-name="Mnemonic Fix" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/mnemonicfix/group" mrp="/sf/os/buildtools/misccomponents/mnemonicfix/group/tools_sdk_eng_mnemonicfix.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/mnemonicfix/group" mrp="os/buildtools/misccomponents/mnemonicfix/group/tools_sdk_eng_mnemonicfix.mrp"/> -->
      </component>
      <component name="n:pathbrowser" long-name="Path Browser" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/pathbrowser/group" mrp="/sf/os/buildtools/misccomponents/pathbrowser/group/tools_sdk_eng_pathbrowser.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/pathbrowser/group" mrp="os/buildtools/misccomponents/pathbrowser/group/tools_sdk_eng_pathbrowser.mrp"/> -->
      </component>
      <component name="n:shellexec" long-name="Shell Exec" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/shellexec/group" mrp="/sf/os/buildtools/misccomponents/shellexec/group/tools_sdk_eng_shellexec.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/shellexec/group" mrp="os/buildtools/misccomponents/shellexec/group/tools_sdk_eng_shellexec.mrp"/> -->
      </component>
      <component name="n:swingworker" long-name="Swing Worker" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/swingworker/group" mrp="/sf/os/buildtools/misccomponents/swingworker/group/tools_sdk_eng_swingworker.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/swingworker/group" mrp="os/buildtools/misccomponents/swingworker/group/tools_sdk_eng_swingworker.mrp"/> -->
      </component>
      <component name="n:testcaserunner" long-name="Test Case Runner" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/testcaserunner/group" mrp="/sf/os/buildtools/misccomponents/testcaserunner/group/tools_sdk_eng_testcaserunner.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/testcaserunner/group" mrp="os/buildtools/misccomponents/testcaserunner/group/tools_sdk_eng_testcaserunner.mrp"/> -->
      </component>
      <component name="n:toolbarpanel" long-name="Tool Bar Panel" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/toolbarpanel/group" mrp="/sf/os/buildtools/misccomponents/toolbarpanel/group/tools_sdk_eng_toolbarpanel.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/toolbarpanel/group" mrp="os/buildtools/misccomponents/toolbarpanel/group/tools_sdk_eng_toolbarpanel.mrp"/> -->
      </component>
      <component name="n:javahelp" long-name="Java Help" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/javahelp/group" mrp="/sf/os/buildtools/misccomponents/javahelp/group/tools_sdk_eng_javahelp.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/javahelp/group" mrp="os/buildtools/misccomponents/javahelp/group/tools_sdk_eng_javahelp.mrp"/> -->
      </component>
      <component name="n:langconfig" long-name="Language Config" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/langconfig/group" mrp="/sf/os/buildtools/misccomponents/langconfig/group/tools_sdk_eng_langconfig.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/langconfig/group" mrp="os/buildtools/misccomponents/langconfig/group/tools_sdk_eng_langconfig.mrp"/> -->
      </component>
      <component name="n:sdkinfo" long-name="SDK Info" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/sdkinfo/group" mrp="/sf/os/buildtools/misccomponents/sdkinfo/group/tools_sdk_eng_sdkinfo.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/sdkinfo/group" mrp="os/buildtools/misccomponents/sdkinfo/group/tools_sdk_eng_sdkinfo.mrp"/> -->
      </component>
      <component name="n:jade" long-name="Jade " filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/jade/group" mrp="/sf/os/buildtools/misccomponents/jade/group/tools_sdk_eng_jade.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/jade/group" mrp="os/buildtools/misccomponents/jade/group/tools_sdk_eng_jade.mrp"/> -->
      </component>
      <component name="n:sdkpackagemgr" long-name="SDK Package Manager" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/sdkpackagemgr/group" mrp="/sf/os/buildtools/misccomponents/sdkpackagemgr/group/tools_sdk_eng_sdkpkg-manager.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/sdkpackagemgr/group" mrp="os/buildtools/misccomponents/sdkpackagemgr/group/tools_sdk_eng_sdkpkg-manager.mrp"/> -->
      </component>
      <component name="n:sdkpkgtools" long-name="SDK Package Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/sdkpkgtools/group" mrp="/sf/os/buildtools/misccomponents/sdkpkgtools/group/tools_sdk_eng_sdkpkg-tools.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/sdkpkgtools/group" mrp="os/buildtools/misccomponents/sdkpkgtools/group/tools_sdk_eng_sdkpkg-tools.mrp"/> -->
      </component>
      <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/sf/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
      </component>
      <component name="n:pkgmgrgui" long-name="SDK Package Manager GUI" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/pkgmgrgui/group" mrp="/sf/os/buildtools/misccomponents/pkgmgrgui/group/tools_sdk_eng_pkgmgrgui.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/pkgmgrgui/group" mrp="os/buildtools/misccomponents/pkgmgrgui/group/tools_sdk_eng_pkgmgrgui.mrp"/> -->
      </component>
      <component name="n:launch" long-name="Launch" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/launch/group" mrp="/sf/os/buildtools/misccomponents/launch/group/tools_sdk_eng_launch.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/launch/group" mrp="os/buildtools/misccomponents/launch/group/tools_sdk_eng_launch.mrp"/> -->
      </component>
      <component name="n:toolsstubs" long-name="Devices Tools Stubs" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/toolsstubs/group" mrp="/sf/os/buildtools/misccomponents/toolsstubs/group/tools_sdk_eng_tools_stubs.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/toolsstubs/group" mrp="os/buildtools/misccomponents/toolsstubs/group/tools_sdk_eng_tools_stubs.mrp"/> -->
      </component>
      <component name="n:bspbuilder" long-name="BSP Builder" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/bspbuilder/group" mrp="/sf/os/buildtools/misccomponents/bspbuilder/group/tools_bspbuilder.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/bspbuilder/group" mrp="os/buildtools/misccomponents/bspbuilder/group/tools_bspbuilder.mrp"/> -->
      </component>
      <component name="n:splash" long-name="Splash Screen" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/splash/group" mrp="/sf/os/buildtools/misccomponents/splash/group/tools_sdk_eng_splash.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/splash/group" mrp="os/buildtools/misccomponents/splash/group/tools_sdk_eng_splash.mrp"/> -->
      </component>
      <component name="n:sdkbuilder" long-name="SDK Building Tools" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/sdkbuilder/group" mrp="/sf/os/buildtools/misccomponents/sdkbuilder/group/tools_sdk_eng_sdk_builder.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/misccomponents/sdkbuilder/group" mrp="os/buildtools/misccomponents/sdkbuilder/group/tools_sdk_eng_sdk_builder.mrp"/> -->
      </component>
     </collection>
     <collection name="n:javatoolsplat" long-name="Java Tools Platform" level="mw">
      <component name="n:javalib" long-name="Java Library " filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/javatoolsplat/javalib/group" mrp="/sf/os/buildtools/javatoolsplat/javalib/group/tools_sdk_eng_javalibrary.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/javatoolsplat/javalib/group" mrp="os/buildtools/javatoolsplat/javalib/group/tools_sdk_eng_javalibrary.mrp"/> -->
      </component>
     </collection>
     <collection name="n:fileconv" long-name="File Converters" level="mw">
      <component name="n:cjpeg" long-name="CJpeg" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/fileconv/cjpeg/group" mrp="/sf/os/buildtools/fileconv/cjpeg/group/tools_sdk_eng_cjpeg.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/fileconv/cjpeg/group" mrp="os/buildtools/fileconv/cjpeg/group/tools_sdk_eng_cjpeg.mrp"/> -->
      </component>
      <component name="n:alp2csh" long-name="ALP to CSH" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/fileconv/alp2csh/group" mrp="/sf/os/buildtools/fileconv/alp2csh/group/tools_sdk_eng_alp2csh.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/fileconv/alp2csh/group" mrp="os/buildtools/fileconv/alp2csh/group/tools_sdk_eng_alp2csh.mrp"/> -->
      </component>
      <component name="n:rtf2ptml" long-name="RTF to PTML" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/fileconv/rtf2ptml/group" mrp="/sf/os/buildtools/fileconv/rtf2ptml/group/tools_sdk_eng_rtf2ptml.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/buildtools/fileconv/rtf2ptml/group" mrp="os/buildtools/fileconv/rtf2ptml/group/tools_sdk_eng_rtf2ptml.mrp"/> -->
      </component>
     </collection>
     <collection name="buildtools_info" long-name="Build Tools Info" level="ui">