--- a/common/build.postbuild.xml	Wed May 26 20:05:06 2010 +0100
+++ b/common/build.postbuild.xml	Wed May 26 17:48:56 2010 +0100
@@ -618,14 +618,26 @@
             <arg value="${build.log.dir}/analysis/${build.id}_what_results.csv"/>
         </exec>
     </target>
-
-    <target name="sf-run-analysis-diamonds">      
-      <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-run-analysis-diamonds.xml.ftl" outputFile="${build.drive}/output/logs/sf-run-analysis-diamonds.xml">
-        <data expandProperties="yes">
-          ant: antProperties()
-          raptor_summary: csv(${build.log.dir}/raptorbits/summary.csv,{separator:',',headers:[category,subcategory,severity,config,component,mmp,phase,recipe,file,line]})
-        </data>
-      </fmpp>
+    
+    <target name="sf-run-analysis-diamonds">
+      <if>
+        <istrue value="${sf.spec.publish.enable}"/>
+        <then>
+          <echo>[SF-RUN-ANALYSIS-DIAMONDS]</echo>
+          <echo message="Translate \output\logs\html\index.html into a Diamonds file"/>
+          <exec executable="perl" dir="${build.drive}">
+            <arg value="${sf.common.config.dir}/tools/uh2diamonds.pl"/>
+          </exec>
+          <echo message="Send ${build.log.dir}/diamonds_uh.xml to Diamonds"/>
+          <exec executable="python">
+		    <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/>
+		    <arg value="-u"/>
+		    <arg value="http://${diamonds.host}${diamonds.build.id}"/>
+		    <arg value="-f"/>
+		    <arg value="${build.log.dir}/diamonds_uh.xml"/>
+		  </exec>
+        </then>
+      </if>
     </target>
     
     <target name="sf-links-to-diamonds">