# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1254763450 -3600
# Node ID 6358982cd10efdff8daf3ea042c92e943e165c6f
# Parent  3692c6f462b438eab1bba74d988436a5ec4c4df6# Parent  339b33d6402f6abf11c531cbcf9b214e45a3faa4
Merge

diff -r 339b33d6402f -r 6358982cd10e common/build.xml
--- a/common/build.xml	Mon Oct 05 17:17:29 2009 +0100
+++ b/common/build.xml	Mon Oct 05 18:24:10 2009 +0100
@@ -23,6 +23,7 @@
     <property name="diamonds.host" value="${sf.spec.publish.diamonds.server}"/>
     <property name="diamonds.port" value="${sf.spec.publish.diamonds.port}"/>
     <property name="diamonds.path" value="${sf.spec.publish.diamonds.path}"/>
+    <property name="build.family" value="${sf.spec.job.name}"/>
     <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}"/>
@@ -30,23 +31,14 @@
 	<property name="ats.drive" value="${sf.spec.ats_worker.drive}"/>
     
     <if>
-      <equals arg1="${sf.spec.publish.diamonds.tag}" arg2="test"/>
-      <then>
-        <property name="sf.test.tag" value=".test"/>
-      </then>
-      <else>
-        <property name="sf.test.tag" value=""/>
-      </else>
-    </if>
-    <property name="build.family" value="${sf.spec.job.name}_${sf.spec.job.codeline}${sf.test.tag}"/>
-    
-    <if>
       <isset property="sf.spec.sbs.numberofjobs"/>
       <then>
         <property name="number.of.threads" value="${sf.spec.sbs.numberofjobs}"/>
       </then>
     </if>
     
+    <property name="sf.diamonds.tags" value="${sf.spec.job.codeline},${sf.spec.publish.diamonds.tag}"/>
+    
     <!-- SF-specific Helium properties not meant to be exposed in the project spec -->
     <property name="diamonds.listener.configuration.file" location="${sf.common.config.dir}/diamonds/config.xml.ftl"/>
     
diff -r 339b33d6402f -r 6358982cd10e sf-package/build.xml
--- a/sf-package/build.xml	Mon Oct 05 17:17:29 2009 +0100
+++ b/sf-package/build.xml	Mon Oct 05 18:24:10 2009 +0100
@@ -3,6 +3,9 @@
   <!-- location of this config -->
   <dirname property="sf.package.config.dir" file="${ant.file.SF-PACKAGE-CONFIG}"/>
   
+  <!-- import codeline-specific properties -->
+  <import file="${sf.package.config.dir}/${sf.spec.job.codeline}_props.ant.xml" optional="yes"/>
+  
   <!-- import package properties -->
   <import file="${sf.package.config.dir}/package_props.ant.xml" />