Only load public properties if available, and restore generate-layers override to maintain Helium 5 compatibility.
--- a/build.xml Tue Jun 22 11:38:44 2010 +0100
+++ b/build.xml Tue Jun 22 12:55:01 2010 +0100
@@ -18,8 +18,12 @@
<!-- import job properties -->
<if><isfalse value="${sf.production.build}"/>
<then>
- <echo message="INFO Using Public properties defined in ${sf.project.location}/public_override_props.ant.xml"/>
- <import file="${sf.project.location}/public_override_props.ant.xml" optional="yes"/>
+ <if><available file="${sf.project.location}/public_override_props.ant.xml"/>
+ <then>
+ <echo message="INFO Using Public properties defined in ${sf.project.location}/public_override_props.ant.xml"/>
+ <import file="${sf.project.location}/public_override_props.ant.xml" optional="yes"/>
+ </then>
+ </if>
</then>
</if>
<import file="${sf.project.location}/${sf.project.name}_props.ant.xml" optional="yes"/>
--- a/common/build.xml Tue Jun 22 11:38:44 2010 +0100
+++ b/common/build.xml Tue Jun 22 12:55:01 2010 +0100
@@ -222,6 +222,26 @@
</fail>
</target>
+ <!-- Note: Not used from Helium 7 onwards -->
+ <target name="generate-layers">
+ <echo message="canno-file:${canonical.sysdef.file}"/>
+ <echo message="raptor-filters:raptor_${sysdef.configuration}"/>
+
+ <!-- All we want is a sysdef with the config name appended, so just copy it -->
+ <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">
+ <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>
+
<target name="sf-summary" depends="">
<echo>[SF-SUMMARY]</echo>
<echo message="Generating build summary"/>