# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1286300921 -3600
# Node ID 1242acdd8aa327dfaaa3293251ee1bee80d11547
# Parent  fd88f2a92e99f9df68de5a42ad848bc05c1e0413
Add tools model and update manifest with winsock and commsfw updates

diff -r fd88f2a92e99 -r 1242acdd8aa3 symbian3/single/job_refs.ant.xml
--- a/symbian3/single/job_refs.ant.xml	Tue Oct 05 16:35:06 2010 +0100
+++ b/symbian3/single/job_refs.ant.xml	Tue Oct 05 18:48:41 2010 +0100
@@ -1,62 +1,67 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS" xmlns:hlm="http://www.nokia.com/helium">
-
-<!-- For a combined model GT+S60, sf.spec.os.system.definition.files must be used -->
-  <path id="sf.spec.os.system.definition.files">
-    <fileset dir="${sf.spec.systemdefinition.location}/" casesensitive="false">
-            <include name="${sf.spec.systemdefinition.filename}" />
-    </fileset>
-  </path>
-    
-  <!-- iMaker config to be used by build-roms Helium target -->
-  <hlm:imakerconfigurationset id="imaker.rom.config">
-     <imakerconfiguration>
-         <makefileset>
-             <!-- Note: case sensitive -->
-             <include name="**/image_conf_syborg.mk"/>
-         </makefileset>
-         <targetset>
-             <include name="^flash$" />
-             <!--
-             include name="langpack_\d+" />
-             <include name="^custvariant_.*$" />
-             <include name="^udaerase$" /
-             -->
-         </targetset>
-         <variableset>
-             <!--
-             <variable name="TYPE" value="rnd"/>
-             <variable name="USE_SYMGEN" value="1"/>
-             <variable name="USE_UDEB" value="1"/>
-             -->
-         </variableset>
-     </imakerconfiguration>
-     
-     <!--imakerconfiguration regionalVariation="false">
-         <makefileset>
-             <include name="**/*zoom2*.mk"/>
-         </makefileset>
-         <targetset>
-             <include name="^core$" />
-         </targetset>
-         <variableset>
-             <variable name="TYPE" value="rnd"/>
-             <variable name="USE_SYMGEN" value="1"/>
-             <variable name="USE_UDEB" value="1"/>
-         </variableset>
-     </imakerconfiguration -->
-     
-     <imakerconfiguration>
-         <makefileset>
-             <include name="/epoc32/rom/config/sf_refhw/beagle/image_conf_beagle.mk"/>
-         </makefileset>
-         <targetset>
-             <include name="^flash$" />
-         </targetset>
-         <variableset/>
-     </imakerconfiguration>
-     
-  </hlm:imakerconfigurationset>
-    
+<?xml version="1.0"?>

+

+<project name="SF-JOB-REFS" xmlns:hlm="http://www.nokia.com/helium">

+

+<!-- For a combined model GT+S60, sf.spec.os.system.definition.files must be used -->

+  <path id="sf.spec.os.system.definition.files">

+    <fileset dir="${sf.spec.systemdefinition.location}/" casesensitive="false">

+            <include name="${sf.spec.systemdefinition.filename}" />

+    </fileset>

+  </path>

+  <path id="sf.spec.tools.system.definition.files">

+    <fileset dir="${sf.spec.tools.systemdefinition.location}/" casesensitive="false">

+            <include name="tools_model.xml" />

+    </fileset>

+  </path>

+    

+  <!-- iMaker config to be used by build-roms Helium target -->

+  <hlm:imakerconfigurationset id="imaker.rom.config">

+     <imakerconfiguration>

+         <makefileset>

+             <!-- Note: case sensitive -->

+             <include name="**/image_conf_syborg.mk"/>

+         </makefileset>

+         <targetset>

+             <include name="^flash$" />

+             <!--

+             include name="langpack_\d+" />

+             <include name="^custvariant_.*$" />

+             <include name="^udaerase$" /

+             -->

+         </targetset>

+         <variableset>

+             <!--

+             <variable name="TYPE" value="rnd"/>

+             <variable name="USE_SYMGEN" value="1"/>

+             <variable name="USE_UDEB" value="1"/>

+             -->

+         </variableset>

+     </imakerconfiguration>

+     

+     <!--imakerconfiguration regionalVariation="false">

+         <makefileset>

+             <include name="**/*zoom2*.mk"/>

+         </makefileset>

+         <targetset>

+             <include name="^core$" />

+         </targetset>

+         <variableset>

+             <variable name="TYPE" value="rnd"/>

+             <variable name="USE_SYMGEN" value="1"/>

+             <variable name="USE_UDEB" value="1"/>

+         </variableset>

+     </imakerconfiguration -->

+     

+     <imakerconfiguration>

+         <makefileset>

+             <include name="/epoc32/rom/config/sf_refhw/beagle/image_conf_beagle.mk"/>

+         </makefileset>

+         <targetset>

+             <include name="^flash$" />

+         </targetset>

+         <variableset/>

+     </imakerconfiguration>

+     

+  </hlm:imakerconfigurationset>

+    

  </project>
\ No newline at end of file
diff -r fd88f2a92e99 -r 1242acdd8aa3 symbian3/single/sources_3.0.3_candidate.csv
--- a/symbian3/single/sources_3.0.3_candidate.csv	Tue Oct 05 16:35:06 2010 +0100
+++ b/symbian3/single/sources_3.0.3_candidate.csv	Tue Oct 05 18:48:41 2010 +0100
@@ -94,7 +94,7 @@
 http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,changeset,99439b07e980,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,650155a80ef8,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,b10722dbe19e,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,changeset,5ebd530e523b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/commsfw/,/sf/os/commsfw,changeset,c34f57d8afa7,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,ad4aec82fb45,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,cce17d67ea66,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,changeset,3d4cd7236b5f,layers.sysdef.xml
@@ -112,3 +112,4 @@
 http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,604ca70b6235,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,changeset,3406c99bc375,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,e541da0d3b0d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sftools/depl/sdkcreationmdw/packaging/,/sftools/depl/sdkcreationmdw/packaging,changeset,ba779db5b8c5,layers.sysdef.xml
\ No newline at end of file