# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1252082336 -3600
# Node ID 1f4867b1e0c1f49b826fc54a420c79541ea23f84
# Parent  44cbd546e28534d210bc5454ba69934002758360
Updated the mechanism for the conditional execution of sf-diamods-tag-build

diff -r 44cbd546e285 -r 1f4867b1e0c1 common/build.xml
--- a/common/build.xml	Fri Sep 04 15:44:00 2009 +0100
+++ b/common/build.xml	Fri Sep 04 17:38:56 2009 +0100
@@ -196,17 +196,7 @@
         <delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
     </target>
 
-    <target name="sf-prebuild" depends="sf-prep">
-        <echo>[SF-PREBUILD]</echo>
-        
-        <if>
-            <istrue value="${sf.spec.publish.enable}"/>
-            <then>
-                <runtarget target="diamonds"/>
-                <runtarget target="sf-diamonds-tag-build"/>
-            </then>
-        </if>
-        
+    <target name="sf-prebuild" depends="sf-prep,sf-prebuild-announce,sf-diamonds-tag-build">
         <!-- create BOM dir -->
         <mkdir dir="${build.drive}/output/logs/BOM"/>
         
@@ -319,13 +309,23 @@
       </if>
     </target>
     
+    <target name="sf-prebuild-announce">
+        <echo>[SF-PREBUILD]</echo>
+    </target>
+
     <target name="sf-diamonds-tag-build">
-      <echo>[SF-DIAMONDS-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>
+      <if>
+        <istrue value="${sf.spec.publish.enable}"/>
+        <then>
+          <echo>[SF-DIAMONDS-TAG-BUILD]</echo>
+          <runtarget target="diamonds"/>
+          <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>
+        </then>
+      </if>
     </target>
     
     <target name="sf-getenv-tools">