# HG changeset patch
# User dariosestito@L063522.prod.ad.symbian.intra
# Date 1237313876 0
# Node ID 3bb3e0eff093a7e50d1949b59d26346bac9503e4
# Parent  9f36ff790ea78f9714febeb912be268dec56f1e8# Parent  c677077df18ce3c0759b593545e13af4ff49cb65
Catchup from Shabe's changes

diff -r 9f36ff790ea7 -r 3bb3e0eff093 build.xml
--- a/build.xml	Tue Mar 17 16:31:24 2009 +0000
+++ b/build.xml	Tue Mar 17 18:17:56 2009 +0000
@@ -2,14 +2,16 @@
 <project name="SF-CONFIG">
   <!-- location of this config -->
   <dirname property="sf.config.dir" file="${ant.file.SF-CONFIG}"/>
+  <property name="sf.project.location" value="../build/config"/>
+  <property name="sf.project.name" value="job"/>
      
   <!-- import job properties -->
-  <import file="${sf.config.dir}/../build/config/job_props.ant.xml" />
+  <import file="${sf.project.location}/${sf.project.name}_props.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" />
+  <import file="${sf.project.location}/${sf.project.name}_refs.ant.xml" />
   
 </project>
\ No newline at end of file
diff -r 9f36ff790ea7 -r 3bb3e0eff093 common/build.xml
--- a/common/build.xml	Tue Mar 17 16:31:24 2009 +0000
+++ b/common/build.xml	Tue Mar 17 18:17:56 2009 +0000
@@ -68,7 +68,7 @@
               outputFile="${sf.common.config.dir}/generated/source-spec.ant.xml">
               <data expandProperties="yes">
                     ant: antProperties()
-                    data: csv(${sf.common.config.dir}/../../build/config/${sf.spec.sourcesync.sourcespecfile}, {separator:','})
+                    data: csv(${sf.project.location}/${sf.spec.sourcesync.sourcespecfile}, {separator:','})
               </data>
         </fmpp>
     </target>
diff -r 9f36ff790ea7 -r 3bb3e0eff093 common/properties.default.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/properties.default.ant.xml	Tue Mar 17 18:17:56 2009 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="SF-PROPERTIES-DEFAULT">
+
+        <dirname property="sf.common.properties.dir" file="${ant.file.SF-PROPERTIES-DEFAULT}"/>    
+
+        <property environment="env"/> <!-- make environment variables available via env -->
+        <property name="build.system"      value="sbs"/>
+        <property name="prep.root.dir"     value=""/>
+                    
+        <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="sf.project.location"   value="${sf.common.properties.dir}/../../build/config"/>
+        <property name="sf.project.name"       value="project_spec.ant.xml"/>
+            
+</project>
+
diff -r 9f36ff790ea7 -r 3bb3e0eff093 common/templates/source-spec.ant.xml.ftl
--- a/common/templates/source-spec.ant.xml.ftl	Tue Mar 17 16:31:24 2009 +0000
+++ b/common/templates/source-spec.ant.xml.ftl	Tue Mar 17 18:17:56 2009 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="hg-build-gen-xml" default="all" xmlns:hlm="http://www.nokia.com/helium">
+<project name="SF-SOURCESPEC" default="all" xmlns:hlm="http://www.nokia.com/helium">
 
 <#assign fileset = "" />
 <#assign target_depends = "" />
@@ -9,7 +9,7 @@
 <#list data as pkg_detail>
     <target name="sf-prebuild-${count}">
         <#if (count > 0) >
-            <#assign fileset = "${fileset}" + "," />
+            <#assign fileset = "${fileset}"  />
         </#if>
         <sequential>
             <delete dir="${ant['build.drive']}${pkg_detail.dst}" failonerror="false"/>
@@ -26,8 +26,16 @@
         </sequential>
     </target>
     <#assign fileset = "${fileset}" + "<fileset dir=\"${ant['build.drive']}${pkg_detail.dst}\" includes=\"${pkg_detail.pattern}\"/>" />
-    <#assign target_depends = "${target_depends}" + "sf-prebuild-${count}" />
-    <#assign count = "${count}" + 1 />
+    
+    <#if (count == 0) >
+    				<#assign target_depends = "${target_depends}" + "sf-prebuild-${count}" />
+    </#if>
+    <#if (count > 0) >
+            <#assign target_depends ="${target_depends}" + ","+"sf-prebuild-${count}"/>
+    </#if>
+    
+    <#assign count = count + 1 />
+
 </#list>
 
     <path id="system.definition.files">