--- a/buildframework/helium/tools/compile/sis.ant.xml	Thu Mar 25 12:47:55 2010 +0000
+++ b/buildframework/helium/tools/compile/sis.ant.xml	Thu Mar 25 14:10:11 2010 +0000
@@ -20,9 +20,15 @@
 
 ============================================================================
 -->
+<!--* @package compile -->
 <project name="compile.sis" xmlns:hlm="http://www.nokia.com/helium">
     <description>Create SIS files.</description>
     
+    <!-- Common Configuration config name. Override to select a specific config group.
+    @type string
+    -->
+    <property name="sis.config.name" value=""/>
+    
     <!-- Preprocesses the SIS configuration file to insert Ant properties. -->
     <target name="preprocess-sis-config" if="sis.config.file">
         <property name="sis.config.file.parsed" location="${build.output.dir}/sis.cfg.xml.parsed" />
@@ -38,20 +44,21 @@
     <target name="sisfiles" depends="preprocess-sis-config" if="sis.config.file">
         <hlm:tempRecordStartMacro name="${build.id}_sisfiles.log"/>        
         <mkdir dir="${build.sisfiles.dir}" />
+        <delete file="${temp.build.dir}/sis_build.ant.xml" failonerror="false"/>
         <hlm:python>
 import configuration
 import sis
 import os
 
 builder = configuration.NestedConfigurationBuilder(open(r'${sis.config.file.parsed}', 'r'))
-configSet = builder.getConfiguration()
-configs = configSet.getConfigurations()
+config_set = builder.getConfiguration()
+config_name = r'${sis.config.name}' if (len(r'${sis.config.name}') > 0) else None
 
-prebuilder = sis.SisPreBuilder(configSet)
+prebuilder = sis.SisPreBuilder(config_set, config_name)
 prebuilder.write(os.path.join(r'${temp.build.dir}', 'sis_build.ant.xml'))
         </hlm:python>
         <ant antfile="${temp.build.dir}/sis_build.ant.xml"/>
-        <hlm:tempRecordStopMacro name="${build.id}_sisfiles.log" filterref="filterset.sisfiles"/>
+        <hlm:tempRecordStopMacro name="${build.id}_sisfiles.log" filterref="filterset.sisfiles" phase="post"/>
         <hlm:metadatarecord xmlns:hlm="http://www.nokia.com/helium" database="${metadata.dbfile}">
             <hlm:textmetadatainput>
                 <fileset casesensitive="false" file="${build.cache.log.dir}/${build.id}_sisfiles.log"/>
@@ -62,3 +69,5 @@
 
 </project>
 
+
+