# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1242037130 -3600
# Node ID 2dd10d600d282aad944bb52a7c7178b08f330418
# Parent  0c06367f2901d3351d772d6e1b2bf8a500a95ed9# Parent  63f36c9fac87979c9956572f0b59982bc56b63fa
Merge project changes

diff -r 63f36c9fac87 -r 2dd10d600d28 ex-nokia/job_props.ant.xml
--- a/ex-nokia/job_props.ant.xml	Mon May 11 11:15:56 2009 +0100
+++ b/ex-nokia/job_props.ant.xml	Mon May 11 11:18:50 2009 +0100
@@ -7,24 +7,24 @@
     <property name="sf.project.type" value="platform" />
     
     <property name="sf.spec.job.name" value="platform"/>
-    <property name="sf.spec.corebuildversion" value="week12"/>
+    <property name="sf.spec.corebuildversion" value="week19"/>
     
     <property name="sf.spec.build.system" value="sbs"/>
     
-    <property name="sf.spec.sbs.config" value="winscw.whatlog"/> <!-- both _urel and _udeb -->
+    <property name="sf.spec.sbs.config" value="winscw.whatlog,armv5.whatlog"/> <!-- both _urel and _udeb -->
     <property name="sf.spec.sbs.tools.config" value="tools_rel,tools2_rel"/>
     
     <property name="sf.spec.sourcesync.usecache" value="true"/>
             
 
     <!-- get full source env and binaries from pdk -->
-    <property name="sf.spec.sourcesync.enable"       value="true"/>
-    <property name="sf.spec.baseline.getenv_options" value="-I emu"/>
+    <property name="sf.spec.sourcesync.enable"       value="false"/>
+    <property name="sf.spec.baseline.getenv_options" value=""/>
     <property name="sf.spec.baseline.enable"         value="true"/>     
     <property name="sf.spec.baseline.clean"          value="true"/>
     
     <property name="sf.spec.baseline.select" value="location" />
-    <property name="sf.spec.baseline.location" value="D:\PDK\PDK_20090401\" />  
+    <property name="sf.spec.baseline.location" value="D:\PDK\PDK_20090507\" />  
     <property name="sf.spec.toolsbaseline.enable" value="true"/>
     <property name="sf.spec.publish.rootdir" value="D:\SF_Builds"/>
     
@@ -58,7 +58,7 @@
     <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"/>
+	<property name="sf.spec.package.bin.enable"  value="false"/>
+	<property name="sf.spec.package.src.enable"  value="false"/>
     
 </project>
diff -r 63f36c9fac87 -r 2dd10d600d28 ex-nokia/job_refs.ant.xml
--- a/ex-nokia/job_refs.ant.xml	Mon May 11 11:15:56 2009 +0100
+++ b/ex-nokia/job_refs.ant.xml	Mon May 11 11:18:50 2009 +0100
@@ -11,7 +11,7 @@
   <path id="sf.spec.s60.system.definition.files">
 <!--        <fileset dir="${sf.project.location}\sysdefs\" includes="S60_*.xml"/> -->
 	<fileset dir="${sf.project.location}/" casesensitive="false">
-			<include name="sysdefs/system_model_s60_sf.xml" />
+			<include name="sysdefs/system_model_s60.xml" />
 	</fileset>
   </path>