# HG changeset patch
# User shaberazvi@LON-ENGBUILD88.prod.ad.symbian.intra
# Date 1236711952 0
# Node ID d40c87fa5c202ef72ba20e039040bce70092840c
# Parent  046dbf1ae2da4b0d0ca8cb2aafd6b8ce897cacba
Restore properties.default.ant.xml and allow projec spec to be configurable

diff -r 046dbf1ae2da -r d40c87fa5c20 build.xml
--- a/build.xml	Mon Mar 09 17:48:32 2009 +0000
+++ b/build.xml	Tue Mar 10 19:05:52 2009 +0000
@@ -3,12 +3,11 @@
   <!-- location of this config -->
   <dirname property="sf.config.dir" file="${ant.file.SF-CONFIG}"/>
   
-  <!--
-  * Property defaults
-   -->
+  <!-- Property defaults -->
+  <import file="${sf.config.dir}/config/properties.default.ant.xml" />   
      
-  <!-- load build type from config/ -->
-  <import file="${sf.config.dir}/../build/config/project_spec.ant.xml" />
+  <!-- load build type from project location/.name -->
+  <import file="${sf.project.location}/${sf.project.name}" />
      
   <import file="sf-${sf.project.type}/build.xml" />
   
diff -r 046dbf1ae2da -r d40c87fa5c20 common/build.xml
--- a/common/build.xml	Mon Mar 09 17:48:32 2009 +0000
+++ b/common/build.xml	Tue Mar 10 19:05:52 2009 +0000
@@ -7,7 +7,7 @@
     
     <!-- import common properties/spec -->
     <loadproperties srcFile="${sf.common.config.dir}/common.properties"/>
-    <import file="${sf.common.config.dir}/common_spec.ant.xml" />
+    <import file="${sf.common.config.dir}/common_spec.ant.xml" />    
     
     <!-- import all core HELIUM targets -->
     <import file="${helium.dir}/helium.ant.xml" />
@@ -52,7 +52,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 046dbf1ae2da -r d40c87fa5c20 common/properties.default.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/properties.default.ant.xml	Tue Mar 10 19:05:52 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.xml"/>
+            
+</project>
+