Restructure sf-prebuild to ensure that sf-build-all doesnt invoke sf-prep.
--- a/common/build.xml Tue Sep 08 13:03:56 2009 +0100
+++ b/common/build.xml Tue Sep 08 15:29:22 2009 +0100
@@ -119,7 +119,7 @@
</exec>
</target>
- <target name="sf-build-all" depends="sf-prebuild,sf-build-noprep,sf-postbuild">
+ <target name="sf-build-all" depends="sf-prebuild-noprep,sf-build-noprep,sf-postbuild">
<echo>[SF-BUILD-ALL]</echo>
</target>
@@ -137,7 +137,7 @@
<echo>[SF-BUILD-AND-PACK]</echo>
</target>
- <target name="sf-build" depends="sf-prep,sf-prebuild,sf-build-noprep,sf-postbuild">
+ <target name="sf-build" depends="sf-prebuild,sf-build-noprep,sf-postbuild">
<echo>[SF-BUILD]</echo>
</target>
@@ -196,7 +196,8 @@
<delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
</target>
- <target name="sf-prebuild" depends="sf-prep,sf-prebuild-announce,sf-diamonds-tag-build,sf-record-proj-conf-bom,sf-getenvs,sf-syncsource,sf-diamondize-bom"/>
+ <target name="sf-prebuild" depends="sf-prep,sf-prebuild-noprep"/>
+ <target name="sf-prebuild-noprep" depends="sf-prebuild-announce,sf-diamonds-tag-build,sf-record-proj-conf-bom,sf-getenvs,sf-syncsource,sf-diamondize-bom"/>
<target name="sf-prebuild-announce">
<echo>[SF-PREBUILD]</echo>