# HG changeset patch
# User dariosestito@L063522.prod.ad.symbian.intra
# Date 1237307484 0
# Node ID 9f36ff790ea78f9714febeb912be268dec56f1e8
# Parent  046dbf1ae2da4b0d0ca8cb2aafd6b8ce897cacba
Reorganized property/reference importing structure

diff -r 046dbf1ae2da -r 9f36ff790ea7 build.xml
--- a/build.xml	Mon Mar 09 17:48:32 2009 +0000
+++ b/build.xml	Tue Mar 17 16:31:24 2009 +0000
@@ -2,15 +2,14 @@
 <project name="SF-CONFIG">
   <!-- location of this config -->
   <dirname property="sf.config.dir" file="${ant.file.SF-CONFIG}"/>
+     
+  <!-- import job properties -->
+  <import file="${sf.config.dir}/../build/config/job_props.ant.xml" />
   
-  <!--
-  * Property defaults
-   -->
-     
-  <!-- load build type from config/ -->
-  <import file="${sf.config.dir}/../build/config/project_spec.ant.xml" />
-     
+  <!-- import project properties/targets/references -->
   <import file="sf-${sf.project.type}/build.xml" />
   
+  <!-- import job references -->
+  <import file="${sf.config.dir}/../build/config/job_refs.ant.xml" />
   
 </project>
\ No newline at end of file
diff -r 046dbf1ae2da -r 9f36ff790ea7 common/build.xml
--- a/common/build.xml	Mon Mar 09 17:48:32 2009 +0000
+++ b/common/build.xml	Tue Mar 17 16:31:24 2009 +0000
@@ -2,15 +2,31 @@
 <project name="SF-COMMON-CONFIG">
 
     <property environment="env"/> <!-- make environment variables available via env -->
-
+    
     <dirname property="sf.common.config.dir" file="${ant.file.SF-COMMON-CONFIG}"/>
     
-    <!-- import common properties/spec -->
-    <loadproperties srcFile="${sf.common.config.dir}/common.properties"/>
-    <import file="${sf.common.config.dir}/common_spec.ant.xml" />
+    <!-- import common properties -->
+    <import file="${sf.common.config.dir}/common_props.ant.xml" />
+    
+    <!-- setup Helium internal properties from their equivalent in the project spec -->
+    <property name="build.name" value="${sf.spec.job.name}"/>
+    <property name="build.number" value="${sf.spec.job.number}"/>
+    <property name="build.family" value="${sf.project.type}"/>
+    <property name="core.build.version" value="${sf.spec.corebuildversion}"/>
+    <property name="email.from" value="${sf.spec.email.from}"/>
+    <property name="local.free.space" value="${sf.spec.job.freespace}"/>
+    <property name="network.free.space" value="${sf.spec.publish.network.freespace}"/>
+    <property name="network.drive" value="${sf.spec.publish.networkdrive}"/>
+    <property name="publish.root.dir" value="${sf.spec.publish.publish.rootdir}"/>
+    <property name="build.system" value="${sf.spec.build.system}"/>
+    <property name="base_release.path" value="${sf.spec.baseline.location}"/>
+    <property name="base_release.getenv_options" value="${sf.spec.baseline.getenv_options}"/>
     
     <!-- import all core HELIUM targets -->
     <import file="${helium.dir}/helium.ant.xml" />
+    
+    <!-- import common references -->
+    <import file="${sf.common.config.dir}/common_refs.ant.xml" />
              
     <!-- conditional import of generated source spec if available -->
     <if><available  file="${sf.common.config.dir}/generated/source-spec.ant.xml" />
@@ -63,9 +79,6 @@
         <if>
             <istrue value="${sf.spec.baseline.enable}" />
             <then>
-                <property name="base_release.path" value="${sf.spec.baseline.location}"/>
-                <property name="base_release.getenv_options" value="${sf.spec.baseline.getenv_options}"/>
-                <echo>base_release.path=${base_release.path}, base_release.getenv_options=${base_release.getenv_options}</echo>
                 <runtarget target="preparation-getenv"/>
             </then>
         </if>
@@ -87,20 +100,27 @@
     </target>
     
     <target name="sf-compile">    
+    
+    	<!-- TODO: add here assigments to raptor-related ant references -->
+ 	
+    	<!-- hlm:argSet id="sbs.tools.var">
+			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
+			<hlm:arg name="singlejob" value="..." />
+			<hlm:arg name="enable-filter" value="..." />
+		</hlm:argSet -->
+    	
         <!-- target name="compile-main-prebuild" -->
         <antcall target="compile-main" inheritAll="false">
-            <param name="build.system" value="sbs" />
-            <param name="sysdef.configurations.list" value="s60_build_clean,s60_build" />
+            <param name="build.system" value="${sf.spec.build.system}"/>
+            <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
             <!--<reference refid="sf.system.definition.files" torefid="system.definition.files" />-->
         </antcall>    
     </target>
     
-    
     <target name="sf-get-source" depends="sf-generate-source-spec">
         <ant antfile="${sf.common.config.dir}/generated/source-spec.ant.xml" />
     </target>
-    
-    
+
 </project>
 
 
diff -r 046dbf1ae2da -r 9f36ff790ea7 common/common.properties
diff -r 046dbf1ae2da -r 9f36ff790ea7 common/common_props.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/common_props.ant.xml	Tue Mar 17 16:31:24 2009 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+
+<project name="SF-COMMON-PROPS" >
+	
+	<property name="sf.spec.sbs.config" value="ramv5"/>
+
+    <property name="sf.project.type" value="package"/>
+	
+    <property name="sf.spec.job.name" value="mypackage"/>
+    <property name="sf.spec.job.number" value="77"/>
+    <property name="sf.spec.job.rootdir" value="myrootdir"/>
+    <property name="sf.spec.job.freespace" value="10"/>
+    <property name="sf.spec.corebuildversion" value="mycorebuildversion"/>
+    <property name="sf.spec.email.from" value="fbf@symbian.org"/> <!-- needs to be defined for S60 platform builds -->
+    
+    <property name="sf.spec.build.target" value="all"/>
+    <property name="sf.spec.build.variant" value=""/>
+    <property name="sf.spec.build.productioncode.enable" value="true"/>
+    <property name="sf.spec.build.testcode.enable" value="false"/>
+    <property name="sf.spec.build.system" value="sbs"/> <!-- sbs|ebs|ec -->
+    <!-- property name="sf.spec.build.sbsv2.config" value=""/ -->
+    <!-- property name="sf.spec.build.sbsv2.options" value="-k"/ -->
+    <property name="sf.spec.build.clean.enable" value="true"/>
+    <property name="sf.spec.sysdef.configurations.list" value="s60_build,s60_bldmelast"/>
+    
+    <property name="sf.spec.referenceroms.createimages.enable" value="false"/>
+    <property name="sf.spec.testroms.createimages.enable" value="false"/>
+    
+    <property name="sf.spec.sourcesync.enable" value="true"/>
+    <property name="sf.spec.sourcesync.usecache" value="false"/>
+    <property name="sf.spec.sourcesync.sourcespecfile" value="sources.csv"/>
+    
+    <property name="sf.spec.baseline.enable" value="true"/>
+    <property name="sf.spec.baseline.select" value="auto"/> <!-- auto|explicit|location -->
+    <property name="sf.spec.baseline.getenv_options" value="-l emu"/>
+    <property name="sf.spec.toolsbaseline.enable" value="true"/>
+    <property name="sf.spec.toolsbaseline.select" value="auto"/>
+    
+    <property name="sf.spec.publish.unpackagedartefacts.enable" value="true"/>
+    <property name="sf.spec.publish.packagedartefacts.enable" value="true"/>
+    <property name="sf.spec.publish.network.freespace" value="10"/>
+    <property name="sf.spec.publish.networkdrive" value="\\builds01\devbuilds\GRACE"/>
+    <property name="sf.spec.publish.publish.rootdir" value="\\builds01\devbuilds\GRACE"/>
+    
+    <property name="sf.spec.tagafterbuild.enable" value="true"/>
+</project>
+
+
diff -r 046dbf1ae2da -r 9f36ff790ea7 common/common_refs.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/common_refs.ant.xml	Tue Mar 17 16:31:24 2009 +0000
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+
+<project name="SF-COMMON-REFS"/>
\ No newline at end of file
diff -r 046dbf1ae2da -r 9f36ff790ea7 common/common_spec.ant.xml
--- a/common/common_spec.ant.xml	Mon Mar 09 17:48:32 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="sf.common" >
-    <property name="sf.project.type" value="package" />
-	
-    <property name="sf.spec.build.target" value="armv5" />
-    <property name="sf.spec.build.variant" value="udeb" />
-    <property name="sf.spec.build.productioncode.enable" value="true" />
-    <property name="sf.spec.build.testcode.enable" value="false" />
-    <property name="sf.spec.build.framework" value="sbsv2" />
-    <property name="sf.spec.build.sbsv2.config" value="" />
-    <property name="sf.spec.build.sbsv2.options" value="-k" />
-    <property name="sf.spec.build.clean.enable" value="true" />
-    
-    <property name="sf.spec.referenceroms.createimages.enable" value="true" />
-    <property name="sf.spec.testroms.createimages.enable" value="true" />
-    
-    <property name="sf.spec.sourcesync.enable" value="true" />
-    <property name="sf.spec.sourcesync.usecache" value="true" />
-    <property name="sf.spec.sourcesync.sourcespecfile" value="sources.csv" />
-    
-    <property name="sf.spec.baseline.enable" value="true" />
-    <property name="sf.spec.baseline.select" value="auto" />
-    <property name="sf.spec.baseline.getenv_options" value="emu"/>
-    <property name="sf.spec.toolsbaseline.enable" value="true" />
-    <property name="sf.spec.toolsbaseline.select" value="auto" />
-    
-    <property name="sf.spec.publish.unpackagedartefacts.enable" value="true" />
-    <property name="sf.spec.publish.packagedartefacts.enable" value="true" />
-    
-    <property name="sf.spec.tagafterbuild.enable" value="true" />
-</project>
-
-
diff -r 046dbf1ae2da -r 9f36ff790ea7 old_vars.txt
--- a/old_vars.txt	Mon Mar 09 17:48:32 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<!-- project name="SF-PROPERTIES-DEFAULT">
-    
-        <property name="build.system"      value="sbs"/>
-        <property name="prep.root.dir"     value=""/>
-        
-        <!-- Compile configuration -->
-        <property name="sysdef.configurations.list" value="s60_build,s60_bldmelast"/>
-
-        <!-- Template for the WA location, each branch got a different location -->
-        <property name="ccm.project.wa_path" location="${data.drive.letter}:\Build_${data.drive.letter}\${env.USERNAME}\ido_wa\${build.name}"/>
-
-        <!--  to get run getenv package/platform, what to get is defined by props below -->
-        <property name="sf.baseline.enable" value="true" />
-        <property name="sf.prebuild.getsrc"               value="true"/>
-
-        
-        <property name="email.from"        value="shabe.razvi@nokia.com"/>
-        
-        <property name="local.free.space"      value="10"/>
-        <property name="network.free.space"    value="10"/>
-        <property name="network.drive"         value="\\builds01\devbuilds\GRACE"/>
-        <property name="publish.root.dir"      value="\\builds01\devbuilds\GRACE"/>
-
-        <property name="hg.tag"      value="1"/>
-            
-</project -->
\ No newline at end of file
diff -r 046dbf1ae2da -r 9f36ff790ea7 sf-package/build.xml
--- a/sf-package/build.xml	Mon Mar 09 17:48:32 2009 +0000
+++ b/sf-package/build.xml	Tue Mar 17 16:31:24 2009 +0000
@@ -3,22 +3,14 @@
   <!-- location of this config -->
   <dirname property="sf.package.config.dir" file="${ant.file.SF-PACKAGE-CONFIG}"/>
   
-  <!--
-  * Property defaults
-   -->
-
-  <!--
+  <!-- import package properties -->
+  <import file="${sf.package.config.dir}/package_props.ant.xml" />
   
-  * Load package specific properties. Mandatory that this file exists otherwise
-  * the target will fail.
+  <!-- import common properties/targets/references -->
+  <import file="../common/build.xml" />
   
-   -->
-  <!-- import properties/spec for this type of build -->
-  <loadproperties srcFile="${sf.package.config.dir}/package.properties"/>
-  <import file="${sf.package.config.dir}/package_spec.ant.xml" />
-  
-  <!-- import common config -->
-  <import file="../common/build.xml" />
+  <!-- import package references -->
+  <import file="${sf.package.config.dir}/package_refs.ant.xml" />
   
 </project>
 
diff -r 046dbf1ae2da -r 9f36ff790ea7 sf-package/package.properties
diff -r 046dbf1ae2da -r 9f36ff790ea7 sf-package/package_props.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf-package/package_props.ant.xml	Tue Mar 17 16:31:24 2009 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+
+<project name="SF-PACKAGE-PROPS"/>
+
diff -r 046dbf1ae2da -r 9f36ff790ea7 sf-package/package_refs.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf-package/package_refs.ant.xml	Tue Mar 17 16:31:24 2009 +0000
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+
+<project name="SF-PACKAGE-REFS"/>
\ No newline at end of file
diff -r 046dbf1ae2da -r 9f36ff790ea7 sf-package/package_spec.ant.xml
--- a/sf-package/package_spec.ant.xml	Mon Mar 09 17:48:32 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="sf.package" >
-    <property name="sf.project.type" value="package" />
-	
-    <property name="sf.spec.build.target" value="armv5" />
-    <property name="sf.spec.build.variant" value="udeb" />
-    <property name="sf.spec.build.productioncode.enable" value="true" />
-    <property name="sf.spec.build.testcode.enable" value="false" />
-    <property name="sf.spec.build.framework" value="sbsv2" />
-    <property name="sf.spec.build.sbsv2.config" value="" />
-    <property name="sf.spec.build.sbsv2.options" value="-k" />
-    <property name="sf.spec.build.clean.enable" value="true" />
-    
-    <property name="sf.spec.referenceroms.createimages.enable" value="true" />
-    <property name="sf.spec.testroms.createimages.enable" value="true" />
-    
-    <property name="sf.spec.sourcesync.enable" value="true" />
-    <property name="sf.spec.sourcesync.usecache" value="true" />
-    <property name="sf.spec.sourcesync.sourcespecfile" value="sources.csv" />
-    
-    <property name="sf.spec.baseline.enable" value="true" />
-    <property name="sf.spec.baseline.select" value="auto" />
-    <property name="sf.spec.toolsbaseline.enable" value="true" />
-    <property name="sf.spec.toolsbaseline.select" value="auto" />
-    
-    <property name="sf.spec.publish.unpackagedartefacts.enable" value="true" />
-    <property name="sf.spec.publish.packagedartefacts.enable" value="true" />
-    
-    <property name="sf.spec.tagafterbuild.enable" value="true" />
-</project>
-