--- a/common/build.xml	Fri Oct 30 11:42:29 2009 +0000
+++ b/common/build.xml	Mon Oct 12 17:27:48 2009 +0100
@@ -72,7 +72,7 @@
         </then>
     </if>
     
-    <target name="sf-prep" depends="prep-drive,init-build-area,sf-generate-source-spec,check-tool-dependencies,create-bom,log-build-env">
+    <target name="sf-prep" depends="prep-drive,init-build-area,check-tool-dependencies,create-bom,log-build-env">
         <echo>[SF-PREP]</echo>
         <!-- Test for the disk space we would like for this build -->
 	<fail>
@@ -207,7 +207,7 @@
     </target>
 
     <target name="sf-prebuild" depends="sf-prep,sf-prebuild-noprep"/>
-    <target name="sf-prebuild-noprep" depends="sf-prebuild-announce,sf-diamonds-connect,sf-diamonds-tag-build,sf-record-proj-conf-bom,sf-getenvs,sf-syncsource,sf-diamondize-bom"/>
+    <target name="sf-prebuild-noprep" depends="sf-prebuild-announce,sf-diamonds-connect,sf-diamonds-tag-build,sf-getenvs,sf-syncsource,sf-diamondize-bom"/>
     
     <target name="sf-prebuild-announce">
         <echo>[SF-PREBUILD]</echo>
@@ -269,6 +269,9 @@
     </target>
 
     <target name="sf-getenvs">
+        <!-- create BOM dir -->
+        <mkdir dir="${build.drive}/output/logs/BOM"/>
+        
         <!-- tools baseline must come before epoc baseline to allow clean listing -->
         <touch file="${build.drive}/output/logs/BOM/toolsbaseline.txt"/>
         <if>
@@ -379,6 +382,7 @@
         </if>
     </target>
 
+    <!-- This target is overridden in platform builds, but used directly in package builds -->
     <target name="sf-build-noprep" depends="sf-truclean,sf-model-from-project,sf-compile,sf-postbuild">
         <echo>[SF-BUILD-NOPREP]</echo>
     </target>