--- a/common/build.xml Mon Jun 22 16:54:21 2009 +0100
+++ b/common/build.xml Mon Jun 22 17:35:46 2009 +0100
@@ -496,7 +496,7 @@
</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/>
+ <copy file="${build.drive}/output/logs/sf-diamondize-bom.xml" tofile="${build.log.dir}/BOM/build-info.xml"/>
</target>
<target name="sf-preprocess-package-config">
--- a/sf-platform/build.xml Mon Jun 22 16:54:21 2009 +0100
+++ b/sf-platform/build.xml Mon Jun 22 17:35:46 2009 +0100
@@ -81,6 +81,7 @@
</for>
</target>
+
<target name="generate-layers">
<echo message="canno-file:${canonical.sysdef.file}"/>
<echo message="raptor-filters:raptor_${sysdef.configuration}"/>
@@ -89,16 +90,16 @@
<echo message="INFO: Skip GenXML and copy sysdef to sysdef+config name"/>
<copy file="${canonical.sysdef.file}" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
- <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml">
- <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml" tofile="${build.log.dir}/BOM/canonical_system_definition_${sysdef.configuration}.xml">
- <filterchain>
- <linecontainsregexp negate="true">
- <regexp pattern="^\s*$"/>
- </linecontainsregexp>
- </filterchain>
- </copy>
- <delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
- </target>
+ <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml">
+ <filterchain>
+ <linecontainsregexp negate="true">
+ <regexp pattern="^\s*$"/>
+ </linecontainsregexp>
+ </filterchain>
+ </copy>
+ <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml" todir="${build.log.dir}/BOM/"/>
+ <delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
+ </target>
<!--
== Name: SF-COMPILE