# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1277138815 -3600
# Node ID b1716671cef8a8229e1d9f0fae2eeac0a0ce4fd8
# Parent  c82cee17fb05ce7cc5cb5a92495d3e04f05a0e84
Update Symbian^2 and Symbian^4 projects with public build configuration

diff -r c82cee17fb05 -r b1716671cef8 symbian2/single/job_props.ant.xml
--- a/symbian2/single/job_props.ant.xml	Mon Jun 21 14:31:20 2010 +0100
+++ b/symbian2/single/job_props.ant.xml	Mon Jun 21 17:46:55 2010 +0100
@@ -29,9 +29,9 @@
     <!-- and set sf.spec.baseline.enable to 'true'                                                          -->        
 
     <!-- get full source env and binaries from pdk -->
-    <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
+    <property name="sf.spec.baseline.location"       value="\\v800008\PDT\prebuilt_default.22_custom" />
     
-    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.2" /> <!-- for TEF etc -->
+    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}_custom" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_1_sf" />
diff -r c82cee17fb05 -r b1716671cef8 symbian2/single/job_refs.ant.xml
--- a/symbian2/single/job_refs.ant.xml	Mon Jun 21 14:31:20 2010 +0100
+++ b/symbian2/single/job_refs.ant.xml	Mon Jun 21 17:46:55 2010 +0100
@@ -3,16 +3,10 @@
 <project name="SF-JOB-REFS">
 
 <!-- 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.project.location}/" casesensitive="false">
-            <include name="sysdefs/system_model.xml" />
+  <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.s60.system.definition.files">
-	<fileset dir="${sf.project.location}/" casesensitive="false">
-			<include name="sysdefs/system_model_s60.xml" />
-	</fileset>
-  </path>   
+  </path>  
     
  </project>
\ No newline at end of file
diff -r c82cee17fb05 -r b1716671cef8 symbian2/single/public_override_props.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian2/single/public_override_props.ant.xml	Mon Jun 21 17:46:55 2010 +0100
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<project name="SF-PUBLIC-PROPS">
+    
+    <dirname property="sf.spec.job.dir" file="${ant.file.SF-PUBLIC-PROPS}"/>
+    <property name="sf.suppress.buildenv.check" value="true" />
+    <property name="sf.suppress.drive.space.check" value="true" />
+    <property name="sf.drive.space.needed" value="40G"/>
+    <property name="sf.spec.job.drive" value="M:"/>
+    
+    <!-- unpack prebuilt binaries and bom? if so from where? -->
+    <property name="sf.spec.baseline.enable"         value="true" />
+    <property name="sf.spec.baseline.location"       value="D:\PDK_3.0.i_download" />
+    <property name="sf.spec.baseline.getenv_options" value="-i emu -i prebuilt -i info -k" />
+    
+    <!-- unpack tools? if so, from same location as baseline? -->
+    <property name="sf.spec.toolsbaseline.enable"         value="true" />
+    <property name="sf.spec.toolsbaseline.location"       value="${sf.spec.baseline.location}" />
+    <property name="sf.spec.toolsbaseline.getenv_options" value="-i tools -k" />
+    
+    <!-- packaging options -->
+    <property name="sf.spec.package.src.enable" value="false" />
+    <property name="sf.spec.package.bin.enable" value="false" />
+    
+    <!-- default build configurations -->
+    <property name="sf.spec.sbs.config"       value="winscw_udeb.whatlog" />
+    <property name="sf.spec.sbs.tools.config" value="tools2.whatlog" />
+
+    <!-- default localisation variant -->
+    <property name="sf.spec.bldmefirst.s60.variant" value="engineering" />
+    
+    <!-- prevent trying to access default SF servers -->
+    <property name="sf.spec.publish.enable"      value="false" />
+    <property name="sf.spec.smoketest.enable"    value="false" />
+    <property name="sf.spec.test.sendpkg.enable" value="false" />
+    
+    <!-- public rnd binaries are in baseline.location, not from mercurial -->
+    <property name="sf.spec.sourcesync.sourcespecfile.rnd" value="nul:"/>
+
+    <!-- use sources defined in BOM as this will rebuild that PDK -->
+    <property name="sf.spec.sourcesync.sourcespecdir"  value="${sf.spec.job.drive}\build_info\logs\BOM"/>
+    <property name="sf.spec.systemdefinition.location" value="${sf.spec.job.drive}\build_info\logs\BOM"/>
+</project>
diff -r c82cee17fb05 -r b1716671cef8 symbian4/single/job_props.ant.xml
--- a/symbian4/single/job_props.ant.xml	Mon Jun 21 14:31:20 2010 +0100
+++ b/symbian4/single/job_props.ant.xml	Mon Jun 21 17:46:55 2010 +0100
@@ -33,8 +33,8 @@
     <!-- and set sf.spec.baseline.enable to 'true'                                                          -->        
 
     <!-- get full source env and binaries from pdk -->
-    <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
-    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\prebuilt_default.22" /> <!-- for TEF,Qmake etc -->
+    <property name="sf.spec.baseline.location"       value="\\v800008\PDT\prebuilt_default.22_custom" />
+    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}_custom" /> <!-- for TEF,Qmake etc -->
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_2_sf" />
diff -r c82cee17fb05 -r b1716671cef8 symbian4/single/job_refs.ant.xml
--- a/symbian4/single/job_refs.ant.xml	Mon Jun 21 14:31:20 2010 +0100
+++ b/symbian4/single/job_refs.ant.xml	Mon Jun 21 17:46:55 2010 +0100
@@ -4,16 +4,10 @@
 
 <!-- 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.project.location}/" casesensitive="false">
-            <include name="sysdefs/system_model.xml" />
+    <fileset dir="${sf.spec.systemdefinition.location}/" casesensitive="false">
+            <include name="${sf.spec.systemdefinition.filename}" />
     </fileset>
   </path>
-  
-  <path id="sf.spec.s60.system.definition.files">
-    <fileset dir="${sf.project.location}/" casesensitive="false">
-        <include name="sysdefs/system_model_s60.xml" />
-    </fileset>
-  </path>   
     
   <!-- iMaker config to be used by build-roms Helium target -->
   <hlm:imakerconfigurationset id="imaker.rom.config">
diff -r c82cee17fb05 -r b1716671cef8 symbian4/single/public_override_props.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/single/public_override_props.ant.xml	Mon Jun 21 17:46:55 2010 +0100
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<project name="SF-PUBLIC-PROPS">
+    
+    <dirname property="sf.spec.job.dir" file="${ant.file.SF-PUBLIC-PROPS}"/>
+    <property name="sf.suppress.buildenv.check" value="true" />
+    <property name="sf.suppress.drive.space.check" value="true" />
+    <property name="sf.drive.space.needed" value="40G"/>
+    <property name="sf.spec.job.drive" value="M:"/>
+    
+    <!-- unpack prebuilt binaries and bom? if so from where? -->
+    <property name="sf.spec.baseline.enable"         value="true" />
+    <property name="sf.spec.baseline.location"       value="D:\PDK_3.0.i_download" />
+    <property name="sf.spec.baseline.getenv_options" value="-i emu -i prebuilt -i info -k" />
+    
+    <!-- unpack tools? if so, from same location as baseline? -->
+    <property name="sf.spec.toolsbaseline.enable"         value="true" />
+    <property name="sf.spec.toolsbaseline.location"       value="${sf.spec.baseline.location}" />
+    <property name="sf.spec.toolsbaseline.getenv_options" value="-i tools -k" />
+    
+    <!-- packaging options -->
+    <property name="sf.spec.package.src.enable" value="false" />
+    <property name="sf.spec.package.bin.enable" value="false" />
+    
+    <!-- default build configurations -->
+    <property name="sf.spec.sbs.config"       value="winscw_udeb.whatlog" />
+    <property name="sf.spec.sbs.tools.config" value="tools2.whatlog" />
+
+    <!-- default localisation variant -->
+    <property name="sf.spec.bldmefirst.s60.variant" value="engineering" />
+    
+    <!-- prevent trying to access default SF servers -->
+    <property name="sf.spec.publish.enable"      value="false" />
+    <property name="sf.spec.smoketest.enable"    value="false" />
+    <property name="sf.spec.test.sendpkg.enable" value="false" />
+    
+    <!-- public rnd binaries are in baseline.location, not from mercurial -->
+    <property name="sf.spec.sourcesync.sourcespecfile.rnd" value="nul:"/>
+
+    <!-- use sources defined in BOM as this will rebuild that PDK -->
+    <property name="sf.spec.sourcesync.sourcespecdir"  value="${sf.spec.job.drive}\build_info\logs\BOM"/>
+    <property name="sf.spec.systemdefinition.location" value="${sf.spec.job.drive}\build_info\logs\BOM"/>
+</project>