# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1248110239 -3600
# Node ID 55c062276b221f0afd81d2ecef29fa803bfbd253
# Parent  2f097e4f5384d7b8c5ddf38ed0d6f3277a312f05
Enable build tagging on Diamonds (default: 'test')

diff -r 2f097e4f5384 -r 55c062276b22 common/build.xml
--- a/common/build.xml	Mon Jul 20 17:15:58 2009 +0100
+++ b/common/build.xml	Mon Jul 20 18:17:19 2009 +0100
@@ -209,6 +209,7 @@
             <istrue value="${sf.spec.publish.enable}"/>
             <then>
                 <runtarget target="diamonds"/>
+                <runtarget target="sf-tag-build"/>
             </then>
         </if>
         
@@ -331,6 +332,15 @@
       </if>
     </target>
     
+    <target name="sf-tag-build">
+      <echo>[SF-TAG-BUILD]</echo>
+      <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-tag-build.xml.ftl" outputFile="${build.drive}/output/logs/sf-tag-build.xml">
+        <data expandProperties="yes">
+          ant: antProperties()
+        </data>
+      </fmpp>
+    </target>
+    
     <target name="sf-postbuild">
         <echo>[SF-POSTBUILD]</echo>
         <parallel>                
diff -r 2f097e4f5384 -r 55c062276b22 common/common_props.ant.xml
--- a/common/common_props.ant.xml	Mon Jul 20 17:15:58 2009 +0100
+++ b/common/common_props.ant.xml	Mon Jul 20 18:17:19 2009 +0100
@@ -54,7 +54,7 @@
     <property name="sf.spec.publish.diamonds.server" value="v800002.ad-sfpd.intra"/>
     <property name="sf.spec.publish.diamonds.port" value="80"/>
     <property name="sf.spec.publish.diamonds.path" value="/diamonds/builds/"/>
-    <property name="sf.spec.publish.diamonds.category" value="${sf.project.type}"/>
+    <property name="sf.spec.publish.diamonds.tag" value="test"/>
     
     <property name="sf.spec.tagafterbuild.enable" value="false"/>
 
diff -r 2f097e4f5384 -r 55c062276b22 common/diamonds/config.xml.ftl
--- a/common/diamonds/config.xml.ftl	Mon Jul 20 17:15:58 2009 +0100
+++ b/common/diamonds/config.xml.ftl	Mon Jul 20 18:17:19 2009 +0100
@@ -71,6 +71,7 @@
             defer="true"/>
             
         <!-- SF specific -->
+        <target name="sf-tag-build"/>
         <target name="sf-diamondize-bom"/>
         <target name="sf-run-analysis"/>
     </targets>
diff -r 2f097e4f5384 -r 55c062276b22 common/diamonds/sf-tag-build.xml.ftl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/diamonds/sf-tag-build.xml.ftl	Mon Jul 20 18:17:19 2009 +0100
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<diamonds-build>
+  <schema>10</schema>
+  <tags>
+    <tag>${ant['sf.spec.publish.diamonds.tag']}</tag>
+  </tags>
+</diamonds-build>
\ No newline at end of file