diff -r 1248e8f6a72d -r db59fc762214 buildframework/helium/tools/compile/compile.ant.xml
--- a/buildframework/helium/tools/compile/compile.ant.xml	Tue Mar 16 17:16:51 2010 +0000
+++ b/buildframework/helium/tools/compile/compile.ant.xml	Thu Mar 18 15:06:42 2010 +0000
@@ -20,19 +20,41 @@
 
 ============================================================================
 -->
+<!--* @package compile -->
 <project name="compile" xmlns:hlm="http://www.nokia.com/helium">
     <description>
         Targets related to compile stage. It includes cmaker,
         ec, ebs, sbs, sbs-ec build system.
     </description>
+    
+    <!--* @property sysdef.configurations.list
+    Comma-separated list of System Definition configuration names to be built in the compile-main stage.
+    @type string
+    @editable required
+    @scope public
+    -->
 
     <!-- Property declaration -->
+    <!-- Suffix used in genxml related output files. This value is added into file names to show that they are genxml related. Used in log files, genxml output files and component list for EE images. Normally does not need to be set.
+    @type string
+    @scope private
+    -->
     <property name="genxml.output.file.suffix" value="genxml" />
+    <!-- Path of sysdef dtd
+    @type string
+    -->
     <property name="compile.sysdef.dtd.stub" location="${helium.dir}/tools/common/dtd/sysdef_dtd_1_4_0.xml" />
+    <!-- Name of the signal input to be able to override the compile-main target.
+    @type string
+    @scope private
+    -->
     <property name="compile.signal.input" value="compileSignalInput" />
-    <property name="diamonds.compile.summary" location="${build.log.dir}/${build.id}_compile_diamonds.xml" />
-
-
+    <!-- Compilation summary file for diamonds.
+    @type string
+    @scope private
+    -->
+    <property name="diamonds.compile.summary" location="${compile.log.dir}/${build.id}_compile_diamonds.xml" />
+    
     <!-- including common compilation macros -->
     <hlm:typedef file="${helium.dir}/tools/compile/compile.antlib.xml" uri="http://www.nokia.com/helium"/>
     <import file="cmaker.ant.xml" />
@@ -41,6 +63,7 @@
     <import file="sbs/sbs.ant.xml" />
     <import file="sis.ant.xml" />
     <import file="qt/qt.ant.xml" />
+    <import file="coverity.ant.xml" />
 
     <!-- A few basic steps (directory creation) that are needed before starting compilation. -->
     <target name="prebuild">
@@ -53,13 +76,14 @@
     </target>
 
     <!-- Does all the necessary steps before starting the component build -->
-    <target name="precompile" depends="record-compile-start-time,create-canonical-sysdef-file,precompile-ec"/>
+    <target name="precompile" depends="record-compile-start-time,create-canonical-sysdef-file,precompile-ec,run-coverity-configure"/>
 
     <!-- post operation for EC builds, submits the compile time and lists all the built components-->
-    <target name="postcompile" depends="postcompile-ec,render-build-duplicates" unless="env.HLM_SUBCON">
-        <antcall target="submit-compile-time"/>
+    <target name="postcompile" depends="postcompile-ec,render-build-duplicates,post-coverity" unless="env.HLM_SUBCON">
+        <runtarget target="submit-compile-time"/>
     </target>
     
+    
     <!-- Pre-processes all System Definition input files.
 
     Any Ant properties used in the files will be replaced by their values.
@@ -81,7 +105,7 @@
         <for param="file">
             <resources refid="system.definition.files"/>
             <sequential>
-                <copy todir="${build.output.dir}/build/input"  verbose="true">
+                <copy todir="${build.output.dir}/build/input" verbose="true">
                     <fileset file="@{file}"/>
                     <filterchain>
                         <replaceregex pattern="bldFile=&quot;common" replace="bldFile=&quot;src\\\\common" flags="gi"/>
@@ -91,19 +115,12 @@
                         <expandproperties/>
                     </filterchain>
                     <mapper>
-                        <scriptmapper language="beanshell">
+                        <scriptmapper language="jython">
 <![CDATA[
-import java.io.File;
-String counter = project.getProperty(".unique.counter");
-int count;
-if (counter == null){
-    count = 0;
-}else{
-    count = Integer.valueOf(counter) + 1;
-}
-project.setProperty(".unique.counter", ""+count);
-targetname = (String.format("%016d",count) + "_"+new File(source).getName());
-self.addMappedName(targetname);
+import os
+(drive, _) = os.path.splitdrive(r'@{file}')
+path = r'@{file}'.replace(drive + os.sep, "", 1)
+self.addMappedName(path)
 ]]>
                         </scriptmapper>
                     </mapper>
@@ -115,19 +132,33 @@
 
     <!-- Merges all preprocessed System Definition files into one combined file. -->
     <target name="create-canonical-sysdef-file" depends="preprocess-sysdef-files">
-        <pathconvert pathsep=" " property="system.definition.files.list">
-            <fileset dir="${build.output.dir}/build/input/" includes="*"/>
-            <chainedmapper>
-                <globmapper from="*" to="-x *" casesensitive="no"/>
-            </chainedmapper>
-        </pathconvert>
-        <hlm:compileGenxmlMergeMacro input="-x ${compile.sysdef.dtd.stub} ${system.definition.files.list}"
-                                    output="${canonical.sysdef.file}"/>
+        <mkdir dir="${compile.log.dir}" />
+        <if>
+            <istrue value="${schema.new}" />
+            <then>
+                <echo message="system model file: ${system.model.file}" />
+                <copy file="${system.model.file}" tofile="${build.drive}/sf/os/deviceplatformrelease/foundation_system/system_model/system_model.xml"/> 
+                <hlm:joinSysdef epocroot="${build.drive}" srcfile="${build.drive}/sf/os/deviceplatformrelease/foundation_system/system_model/system_model.xml" 
+                    destfile="${canonical.sysdef.file}.join.xml" />
+                <!-- <hlm:mergeSysdef epocroot="${epocroot}" destfile="${canonical.sysdef.file}" srcfile="${canonical.sysdef.file}.join.xml" downstreamfile="${epocroot}/layer2.sysdef.xml" /> -->
+                <hlm:downgradeSysdef epocroot="${build.drive}" srcfile="${canonical.sysdef.file}.join.xml" 
+                    destfile="${canonical.sysdef.file}"/>
+            </then>
+            <else>
+                <pathconvert pathsep=" " property="system.definition.files.list">
+                    <fileset dir="${build.output.dir}/build/input/" includes="**"/>
+                    <chainedmapper>
+                        <globmapper from="*" to="-x '*'" casesensitive="no"/>
+                    </chainedmapper>
+                </pathconvert>
+                <hlm:compileGenxmlMergeMacro input="-x ${compile.sysdef.dtd.stub} ${system.definition.files.list}"
+                                            output="${canonical.sysdef.file}" logfile="${compile.log.dir}/${build.id}.sysdef_GenxmlMerge.log"/>
+            </else>
+        </if>
     </target>
 
-    <!--
-      Supports a cleaning of binaries before starting compilation, based on a SysDef configuration.
-      <deprecated>Please consider using ido-prep-clean target.</deprecated>
+    <!-- Supports a cleaning of binaries before starting compilation, based on a SysDef configuration.
+    @deprecated Please consider using ido-prep-clean target.
     -->
     <target name="compile-clean" depends="create-canonical-sysdef-file"
       if="sysdef.clean.configuration">
@@ -150,7 +181,7 @@
                 <hlm:compileGenxmlMacro input="-x ${canonical.sysdef.file}"
                                         configuration="${sysdef.configuration}"
                                         output="${genxml.output.file}"
-                                        log="${build.log.dir}/${build.id}.${sysdef.configuration}_${genxml.output.file.suffix}.log" />
+                                        log="${compile.log.dir}/${build.id}.${sysdef.configuration}_${genxml.output.file.suffix}.log" />
             </then>
         </if>
     </target>
@@ -221,21 +252,21 @@
                         <isfalse value="${compile.discard.result}"/>
                     </not>
                     <then>
-                        <delete file="${build.log.dir}/${build.id}.${sysdef.configuration}_compile.log.xml" failonerror="false"/>
+                        <delete file="${compile.log.dir}/${build.id}.${sysdef.configuration}_compile.log.xml" failonerror="false"/>
                     </then>
                 </if>
             </then>
             <else>
-                <exec executable="perl" dir="${build.drive}/" output="${build.log.dir}/${build.id}.${sysdef.configuration}_scan1.log" failonerror="${failonerror}">
+                <exec executable="perl" dir="${build.drive}/" output="${compile.log.dir}/${build.id}.${sysdef.configuration}_scan1.log" failonerror="${failonerror}">
                     <arg value="${epocroot}epoc32/tools/scanlog.pl"/>
-                    <arg file="${build.log.dir}/${build.id}.${sysdef.configuration}_compile.log"/>
+                    <arg file="${compile.log.dir}/${build.id}.${sysdef.configuration}_compile.log"/>
                 </exec>
                 <exec executable="perl" dir="${build.drive}/" failonerror="${failonerror}">
                     <arg value="${epocroot}epoc32/tools/htmlscanlog.pl"/>
                     <arg value="-v"/>
                     <arg value="-v"/>
                     <arg value="-l"/>
-                    <arg file="${build.log.dir}/${build.id}.${sysdef.configuration}_compile.log"/>
+                    <arg file="${compile.log.dir}/${build.id}.${sysdef.configuration}_compile.log"/>
                     <arg value="-o"/>
                     <arg file="${build.log.dir}/${build.id}.${sysdef.configuration}_scan2.html"/>
                 </exec>
@@ -249,12 +280,12 @@
                     <then>
                         <hlm:metadatarecord database="${metadata.dbfile}">
                             <hlm:abldmetadatainput>
-                                <fileset casesensitive="false" file="${build.log.dir}/${build.id}.${sysdef.configuration}_compile.log" />
+                                <fileset casesensitive="false" file="${compile.log.dir}/${build.id}.${sysdef.configuration}_compile.log" />
                                 <metadatafilterset refid="filterset.compile" />
                             </hlm:abldmetadatainput>
                         </hlm:metadatarecord>
                         <hlm:compileLogSignalMacro compile.summary.file="${build.id}.${sysdef.configuration}_compile.log" 
-                            error.limit="${build.errors.limit}" />
+                            error.limit="${build.errors.limit}" phase="compile"/>
                         <!-- Todo: metadata: insert assertions for metadata parsing here -->
                     </then>
                 </if>
@@ -356,56 +387,40 @@
 
     <!-- Creates a .csv log of the sizes of all the binaries created in the build. -->
     <target name="binary-sizes-log" if="binary.sizes.output">
-        <hlm:startSpecificLogMacro name="${build.log.dir}/${build.id}_binary_sizes.log"/>
+        <hlm:startSpecificLogMacro name="${compile.log.dir}/${build.id}_binary_sizes.log" phase="compile"/>
+        <!-- File containing data related to flash image size
+        @type string
+        @scope private
+        -->
         <property name="binary.sizes.output.file" location="${build.log.dir}/${build.id}_flash_image_size_data.csv"/>
         <pathconvert pathsep=";" property="build.logs.list">
-            <fileset dir="${build.log.dir}" includes="*_build.log" excludes="*ant_build.log;*_zipup_build.log"/>
+            <fileset dir="${compile.log.dir}" includes="*_build.log" excludes="*ant_build.log;*_zipup_build.log"/>
         </pathconvert>
         <pathconvert pathsep=";" property="binary.sizes.rom.logs.list">
             <fileset refid="binary.sizes.rom.logs"/>
         </pathconvert>
         <hlm:python>
 import logging
-
-import build.io
+import compilation
 import sysdef.api
-import sysdef.io
-
 #logging.basicConfig(level=logging.DEBUG)
 logging.basicConfig(level=logging.INFO)
 
 logging.info('Reading the System Sefinition information')
 sysDef = sysdef.api.SystemDefinition(r'${canonical.sysdef.file}')
 
+bnsizelogger = compilation.BinarySizeLogger(sysDef)
 # Read in the output binaries of each unit
-logging.info('Reading the output binaries created by each unit.')
-build_logs = r'${build.logs.list}'.split(';')
-if len(build_logs) == 0:
-    raise Exception('List of build logs is empty!')
-logging.info("The list of log files:\n")
-logging.info("\n".join(build_logs))
-for logpath in build_logs:
-    binaries_reader = build.io.AbldLogWhatReader(logpath)
-    sysDef.merge_binaries(binaries_reader)
+bnsizelogger.read_output_binaries_per_unit(r'${build.logs.list}'.split(';'))
 
 # Read in the binary sizes listed in the ROM output logs
-logging.info('Reading the binary sizes of each binary from ROM logs.')
-rom_logs = r'${binary.sizes.rom.logs.list}'.split(';')
-if len(rom_logs) == 0:
-    raise Exception('List of ROM logs is empty!')
-logging.info("The list of log files:\n")
-logging.info("\n".join(rom_logs))
-for log in rom_logs:
-    binary_sizes_reader = build.io.RombuildLogBinarySizeReader(log)
-    sysDef.merge_binary_sizes(binary_sizes_reader)
+bnsizelogger.read_binary_sizes_in_rom_output_logs(r'${binary.sizes.rom.logs.list}'.split(';'))
 
 # Write out a .csv file containing
-size_writer = sysdef.io.FlashImageSizeWriter(r'${binary.sizes.output.file}')
-size_writer.write(sysDef, r'${sysdef.configurations.list}'.split(','))
-size_writer.close()
+bnsizelogger.write2csvfile(r'${binary.sizes.output.file}', r'${sysdef.configurations.list}'.split(','))
         </hlm:python>
         <hlm:assertFileExists file="${binary.sizes.output.file}"/>
-        <hlm:stopSpecificLogMacro name="${build.log.dir}/${build.id}_binary_sizes.log"/>
+        <hlm:stopSpecificLogMacro name="${compile.log.dir}/${build.id}_binary_sizes.log" phase="compile"/>
     </target>