--- a/sf-platform/compile.ant.xml	Wed Mar 03 19:46:30 2010 +0000
+++ b/sf-platform/compile.ant.xml	Thu Mar 04 18:54:21 2010 +0000
@@ -23,7 +23,7 @@
   <!-- compile sbs.tools.config and sbs.config. tools built only if its not being unpacked first.
        note: must be called from sf-os/s60-compile targets, as sys model input needed -->
   <target name="sf-do-compile">
-    <echo message="INFO Using Helium 7 for sf-do-compile"/>
+    <echo message="INFO Using Helium 7+ for sf-do-compile"/>
     <propertyregex property="sf.unpack.tools" override="true" input="${sf.spec.baseline.getenv_options}" regexp="-i tools" select="true" defaultValue="false" casesensitive="false"/>
   
     <if> <!-- If tools baseline unpack has not been specified, or its not a "fast" build then try to build them -->
@@ -69,8 +69,8 @@
                     <arg line="-t ${sf.spec.sbs.retry.limit}"/>
                     <arg line="${sf.spec.sbs.options}"/>
                     <arg name="--filters" value="&quot;${sf.spec.sbs.filter.list}&quot;"/>
-                    <arg name="--logfile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_compile.log" />
-                    <arg name="--makefile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_Makefile" />
+                    <arg name="--logfile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_${sf.spec.os.sysdef.clean.configurations.list}_compile.log" />
+                    <arg name="--makefile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_${sf.spec.os.sysdef.clean.configurations.list}_Makefile" />
                 </sbsOptions>
             </hlm:sbsinput>
             
@@ -89,9 +89,9 @@
            <propertyregex property="i.sf.spec.sbs.config.expanded"         override="true" input="${i.sf.spec.sbs.config}" regexp="(,)" replace=" -c " defaultValue="${i.sf.spec.sbs.config}" global="true"  casesensitive="false"/>
            <propertyregex property="i.sf.spec.sbs.config.expanded.logname" override="true" input="${i.sf.spec.sbs.config}" regexp="(,)" replace="_"    defaultValue="${i.sf.spec.sbs.config}" global="true"  casesensitive="false"/>
            <echo message="INFO Target : ${i.sf.spec.sbs.config.expanded}"/>
-           <echo message="INFO Logname: ${i.sf.spec.sbs.config.expanded.logname}"/>
+           <echo message="INFO Logname: ${i.sf.spec.sbs.config.expanded.logname} + Config: ${sf.spec.os.sysdef.clean.configurations.list}"/>
            
-           <!-- TODO: Make this use above compile-main call -->
+           <!-- TODO: Make this use above compile-main call? -->
            
            <!-- define sbs args, log name etc -->
            <hlm:sbsinput id="sf.build">
@@ -102,8 +102,8 @@
                     <arg line="-t ${sf.spec.sbs.retry.limit}"/>
                     <arg line="${sf.spec.sbs.options}"/>
                     <arg name="--filters" value="&quot;${sf.spec.sbs.filter.list}&quot;"/>
-                    <arg name="--logfile" value="${compile.log.dir}/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_compile.log" />
-                    <arg name="--makefile" value="${compile.log.dir}/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_Makefile" />
+                    <arg name="--logfile" value="${compile.log.dir}/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_${sf.spec.os.sysdef.clean.configurations.list}_compile.log" />
+                    <arg name="--makefile" value="${compile.log.dir}/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_${sf.spec.os.sysdef.clean.configurations.list}_Makefile" />
                 </sbsOptions>
            </hlm:sbsinput>