# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1249567408 -3600
# Node ID 473fefd9c5deafd4509991aff44200b788ee5cd3
# Parent  1d3a752f672324345d50f8b213093ffa9d776218
Set project name and codeline from subproject only if these properties are not found in project's job_props.ant.xml

diff -r 1d3a752f6723 -r 473fefd9c5de build.xml
--- a/build.xml	Thu Aug 06 11:11:45 2009 +0100
+++ b/build.xml	Thu Aug 06 15:03:28 2009 +0100
@@ -6,7 +6,11 @@
   <property name="sf.subproject.path" value=""/>
   <property name="sf.project.location" value="${sf.config.dir}/../build/config/${sf.subproject.path}"/>
   <property name="sf.project.name" value="job"/>
+     
+  <!-- import job properties -->
+  <import file="${sf.project.location}/${sf.project.name}_props.ant.xml" optional="yes"/>
   
+  <!-- set sf.spec.job.name and sf.spec.job.codeline if they are not specified in the project's job_props.ant.xml -->
   <path id="lib.path">
     <fileset dir="${helium.dir}/external/antlibs" includes="**/*.jar"/>
   </path>
@@ -17,9 +21,6 @@
   <property name="codeline" value="default"/>
   <property name="sf.spec.job.name" value="${jobname}"/>
   <property name="sf.spec.job.codeline" value="${codeline}"/>
-     
-  <!-- import job properties -->
-  <import file="${sf.project.location}/${sf.project.name}_props.ant.xml" optional="yes"/>
   
   <!-- import project properties/targets/references -->
   <import file="sf-${sf.project.type}/build.xml" />