diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-diamondize-bom.html --- a/doc/api/helium/target-sf-diamondize-bom.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-diamondize-bom.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@
Location
-D:\maintools\sf-config\common\build.xml:420: +
d:\maintools\sf-config\common\build.xml:430:
Conditional execution
@@ -129,8 +129,10 @@- <target name="sf-diamondize-bom"> - <if> - <istrue value="${sf.spec.publish.enable}"/> - <then> - <fmpp sourceFile="${sf.common.config.dir}/templates/build-info.xml.ftl" outputFile="${build.drive}/output/logs/sf-diamondize-bom.xml"> - <data expandProperties="yes"> - ant: antProperties() - config: csv(${build.drive}/output/logs/BOM/config.csv,{separator:',',headers:[loc,dst,rev]}) - project: csv(${build.drive}/output/logs/BOM/project.csv,{separator:',',headers:[loc,dst,rev]}) - baseline: slicedText(${build.drive}/output/logs/BOM/baseline.txt,{trim}) - toolsbaseline: slicedText(${build.drive}/output/logs/BOM/toolsbaseline.txt,{trim}) - sources: csv(${build.drive}/output/logs/BOM/sources.csv,{separator:',',headers:[loc,dst,type,rev,sysdef]}) - </data> - </fmpp> - <!-- Make a copy in BOM dir --> - <copy file="${build.drive}/output/logs/sf-diamondize-bom.xml" tofile="${build.log.dir}/BOM/build-info.xml"/> - </then> - </if> + <target name="sf-diamondize-bom" depends="sf-record-proj-conf-bom"> + <fmpp sourceFile="${sf.common.config.dir}/templates/build-info.xml.ftl" outputFile="${build.drive}/output/logs/sf-diamondize-bom.xml"> + <data expandProperties="yes"> + ant: antProperties() + config: csv(${build.drive}/output/logs/BOM/config.csv,{separator:',',headers:[loc,dst,rev]}) + project: csv(${build.drive}/output/logs/BOM/project.csv,{separator:',',headers:[loc,dst,rev]}) + baseline: slicedText(${build.drive}/output/logs/BOM/baseline.txt,{trim}) + toolsbaseline: slicedText(${build.drive}/output/logs/BOM/toolsbaseline.txt,{trim}) + sources: csv(${build.drive}/output/logs/BOM/sources.csv,{separator:',',headers:[loc,dst,type,rev,sysdef]}) + </data> + </fmpp> + <!-- Make a copy in BOM dir --> + <copy file="${build.drive}/output/logs/sf-diamondize-bom.xml" tofile="${build.log.dir}/BOM/build-info.xml"/> </target>