--- a/buildframework/helium/builder/build.xml	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/builder/build.xml	Wed Jun 16 16:51:40 2010 +0300
@@ -25,7 +25,7 @@
     <taskdef name="fmpp" classname="fmpp.tools.AntTask" />
     <import file="delivery.ant.xml" />
 
-    <!-- Ensuring that only Ant 1.7.0 is in use. -->
+    <!-- Ensuring that only Ant 1.7.0 is in use. 
     <ac:if>
         <not>
             <contains string="${ant.version}" substring="1.7.0" />
@@ -33,11 +33,12 @@
         <then>
             <fail message="Your current ant version is ${ant.version}, you must use 1.7.0" />
         </then>
-    </ac:if>            
+    </ac:if>            -->
 
     <condition property="platform" value="win32" else="unix">
         <os family="windows"/>
     </condition>
+    
     <dirname property="builder.dir" file="${ant.file.helium-builder}" />
     <property name="source.root.dir" location="${builder.dir}/.." />
     <property name="build.temp.dir" location="${source.root.dir}/build" />
@@ -63,22 +64,26 @@
         <exclude name="build/**" />
     </fileset>
   
+    
     <target name="cleanup" description="Cleanup (delete the temp build directory)">
         <delete dir="${build.temp.dir}" failonerror="false"/>
     </target>
     
+    
     <target name="get-build-list">
         <ivy:buildlist reference="ivy.buildlist.path">
             <fileset refid="ant.build.files"/>
         </ivy:buildlist>
     </target>
 
+    
     <target name="report" depends="get-build-list" description="Create Ivy report for each component">
         <subant target="report" buildpathref="ivy.buildlist.path">
             <property name="builder.dir" location="${builder.dir}" />
         </subant>
     </target>
   
+    
     <target name="compile" depends="get-build-list">
         <subant target="compile" buildpathref="ivy.buildlist.path">
             <property name="builder.dir" location="${builder.dir}" />
@@ -86,6 +91,7 @@
         </subant>
     </target>
 
+    
     <target name="build" depends="get-build-list" description="Build each component">
         <subant target="package" buildpathref="ivy.buildlist.path">
             <property name="builder.dir" location="${builder.dir}" />
@@ -94,6 +100,7 @@
         </subant>
     </target>
 
+    
     <target name="clean" depends="get-build-list" description="Run clean on each component">
         <subant target="clean" buildpathref="ivy.buildlist.path">
             <property name="builder.dir" location="${builder.dir}" />
@@ -101,6 +108,7 @@
         </subant>
     </target>
   
+    
     <target name="test" depends="get-build-list,build" description="Run test on each component">
         <ac:for param="file" keepgoing="true">
             <path refid="ivy.buildlist.path" />
@@ -108,6 +116,7 @@
                 <echo>Testing: @{file}</echo>
                 <ant antfile="@{file}" dir="@{file}/.." target="test" inheritAll="false">
                     <property name="builder.dir" location="${builder.dir}" />
+                    <property name="source.root.dir" location="${source.root.dir}" />
                 </ant>
             </sequential>
         </ac:for>
@@ -115,18 +124,23 @@
     <!-- TODO: remove after CI tools are cleaned up -->
     <target name="unittest" depends="test"/>
     
-    <target name="junit" depends="get-build-list" description="Run junit on each component">
+    
+    <target name="junit" depends="get-build-list" description="Run JUnit tests on each component">
         <subant target="junit" buildpathref="ivy.buildlist.path">
             <property name="builder.dir" location="${builder.dir}" />
+            <property name="source.root.dir" location="${source.root.dir}" />
         </subant>
     </target>
     
-    <target name="antunit" depends="get-build-list" description="Run antunit on each component">
+    
+    <target name="antunit" depends="get-build-list" description="Run AntUnit tests on each component">
         <subant target="antunit" buildpathref="ivy.buildlist.path">
             <property name="builder.dir" location="${builder.dir}" />
+            <property name="source.root.dir" location="${source.root.dir}" />
         </subant>
     </target>
     
+    
     <target name="quality" depends="get-build-list" description="Run quality checks on each component">
         <ac:for param="file" keepgoing="true">
             <path refid="ivy.buildlist.path" />
@@ -141,6 +155,7 @@
         </ac:for>
     </target>
 
+    
     <target name="checkstyle" depends="get-build-list" description="Run checkstyle on each component">
         <ac:for param="file" keepgoing="true">
             <path refid="ivy.buildlist.path" />
@@ -154,6 +169,7 @@
         </ac:for>
     </target>
 
+    
     <target name="get-deps" description="Retrieving Helium dependencies">
         <ac:if>
             <not>
@@ -179,7 +195,7 @@
             module="helium-${config}-config" revision="1.0"
             inline="true" type="egg"
             pattern="${source.root.dir}/external/python/lib/auto/[artifact]-[revision].[ext]" />
-        <fileset id="egg.deps.fileset" dir="${source.root.dir}/external/python/lib/auto" includes="*.egg" />
+        <fileset id="egg.deps.fileset" dir="${source.root.dir}/external/python/lib/auto" includes="*.egg" excludes="jython*.egg" />
         <fmpp sourceFile="template/easy-install.pth.ftl" outputFile="${source.root.dir}/external/python/lib/auto/easy-install.pth">
             <data>
                 project: antProject()
@@ -254,6 +270,7 @@
         <echo message="Revision set to: ${helium.revision}" />
     </target>
     
+    
     <target name="update-version" depends="get-helium-revision">
         <ac:if>
             <available file="${source.root.dir}/config/version.txt.orig" />
@@ -268,10 +285,12 @@
         </propertyfile>
     </target>
 
+    
     <target name="restore-version">
         <move file="${source.root.dir}/config/version.txt.orig" tofile="${source.root.dir}/config/version.txt" />
     </target>
     
+    
     <target name="create-releasable" depends="get-deps,update-version,build-helium-docs,zip-releasable,restore-version" description="Create releasable binary package"/>
     
     
@@ -287,6 +306,7 @@
         <rstMacro version="1.0" src="${build.temp.dir}/doc/doctmp"/>
     </target>
     
+    
     <!-- Macro to generate html docs from rst. -->
     <macrodef name="rstMacro">
         <attribute name="version"/>
@@ -308,4 +328,7 @@
             </exec>
         </sequential>
     </macrodef>
+    
 </project>
+
+

--- a/buildframework/helium/builder/delivery.ant.xml	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/builder/delivery.ant.xml	Wed Jun 16 16:51:40 2010 +0300
@@ -95,29 +95,35 @@
         <mkdir dir="${build.temp.dir}/temp" />
         <basename file="${binary.delivery.zip}" property="binary.delivery.basename" />
         <copy todir="${build.temp.dir}/temp" verbose="true">
-            <fileset dir="${publish.ci.dir}/${delivery.type}">
-                <include name="*/${binary.delivery.basename}" />
-                <scriptselector language="jython">
+            <first>
+                <sort>
+                    <reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
+                        <date />
+                    </reverse>
+                    <fileset dir="${publish.ci.dir}/${delivery.type}">
+                        <include name="*/${binary.delivery.basename}" />
+                        <scriptselector language="jython">
 <![CDATA[
 try:
     open(file.getParent() + "/tickler.txt").close()
-    myrev = int(file.getParentFile().getName())
-    selected = True
-    for f in file.getParentFile().getParentFile().listFiles():
-        try:
-            if myrev < int(f.getName()):
-                selected = False
-        except:
-            pass
-    self.setSelected(selected)
+    self.setSelected(True)
 except:
     print "No ticker file for %s" % file
     self.setSelected(False)
 ]]>
-                </scriptselector>
-            </fileset>
+                        </scriptselector>
+                    </fileset>
+                </sort>
+            </first>
             <flattenmapper/>
         </copy>
         <unzip src="${build.temp.dir}/temp/${binary.delivery.basename}" dest="${build.temp.dir}/temp" />
     </target>
+    
+    <target name="get-latest-sf-delivery">
+        <antcall target="get-latest-delivery">
+            <param name="delivery.type" value="sf"/>
+        </antcall>
+    </target>
+    
 </project>
\ No newline at end of file

--- a/buildframework/helium/builder/java/config/java_checkstyle_config.xml	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/builder/java/config/java_checkstyle_config.xml	Wed Jun 16 16:51:40 2010 +0300
@@ -72,7 +72,11 @@
         <!-- See http://checkstyle.sf.net/config_naming.html -->
         <module name="ConstantName"/>
         <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
+        <module name="LocalVariableName">
+            <property name="format" value="^[ij]$|^[a-z][a-zA-Z0-9]+$"/>
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="severity" value="warning"/>
+        </module>
         <module name="MemberName"/>
         <module name="MethodName"/>
         <module name="PackageName"/>
@@ -189,6 +193,13 @@
         <module name="SuperFinalize"/>
         
         <module name="IllegalCatch"/>
+        
+        <module name="MethodParamPad">
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="Indentation">
+            <property name="severity" value="warning"/>
+        </module>
     </module>
 
 </module>

--- a/buildframework/helium/builder/java/macros.ant.xml	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/builder/java/macros.ant.xml	Wed Jun 16 16:51:40 2010 +0300
@@ -29,13 +29,16 @@
             <include name="**/*.jar" />
         </fileset>
     </path>
+    
     <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="emma.classpath"/>
     <taskdef classpathref="emma.classpath" resource="emma_ant.properties" />
     
+    
     <target name="clean">
         <delete dir="${module.temp.dir}" />
     </target>
 
+    
     <target name="resolve">
         <mkdir dir="${lib.dir}"/> <!-- not usually necessary, ivy creates the directory IF there are dependencies -->
         <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
@@ -45,12 +48,15 @@
         <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" log="download-only"/>
     </target>
 
+    
     <target name="report" depends="resolve" description="--> generates a report of dependencies">
         <ivy:report todir="${build.dir}"/>
     </target>
 
+    
     <target name="quality" depends="checkstyle" />
     
+    
     <target name="checkstyle" depends="resolve">
         <mkdir dir="${module.temp.dir}"/>
         <echo>Running checkstyle on ${ant.project.name}.</echo>
@@ -66,6 +72,7 @@
         </cs:checkstyle>
     </target>
     
+    
     <target name="compile" depends="resolve" description="--> compile the project">
         <mkdir dir="${classes.dir}" />
         <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="lib.path.id" debug="true" source="1.6" target="1.6" listfiles="true"> 
@@ -75,6 +82,7 @@
         </javac>
     </target>
 
+    
     <target name="ivy-new-version"  unless="ivy.new.revision">
         <!-- default module version prefix value 
         <property name="module.version.prefix" value="${module.version.target}-dev-b" />
@@ -86,6 +94,7 @@
             revision="${module.version.prefix}" defaultBuildNumber="1" revSep=""/> -->
     </target>
 
+    
     <target name="local-version">
         <!--<tstamp>
             <format property="now" pattern="yyyyMMddHHmmss"/>
@@ -93,6 +102,7 @@
         <property name="ivy.new.revision" value="${module.version.target}-local-${now}"/>-->
     </target>
     
+    
     <target name="version" depends="ivy-new-version">
         <!-- create version file in classpath for later inclusion in jar 
         <mkdir dir="${classes.dir}"/>
@@ -102,6 +112,7 @@
         <property file="${classes.dir}/${ant.project.name}.properties" />-->
     </target>
     
+    
     <target name="package" depends="local-version,version,compile" description="--> make a jar file for this project">
         <delete dir="${module.bin.dir}"/>
         <mkdir dir="${module.bin.dir}" />
@@ -122,7 +133,7 @@
         <!--copy file="${module.bin.dir}/${ant.project.name}.jar" todir="${bin.dir}" /-->
         <!--
         <mkdir dir="${bin.dir}/com.nokia.helium/${ant.project.name}/${version}" />
-        <copy file="${bin.dir}/com.nokia.helium/${ant.project.name}/${version}/${ant.project.name}.jar" todir="${module.bin.dir}" />
+        <copy file="${bin.dir}/com.nokia.helium/${ant.project.name}/${version}/${ant.project.name}.jar" todir="${module.bin.dir}" />
         [organisation]/[module]/[color]/[revision]/[artifact].[ext] 
         
         pubrevision="${version}"
@@ -140,7 +151,8 @@
 
     <target name="test" depends="junit,antunit"/>
 
-    <target name="junit">
+    
+    <target name="junit" depends="resolve">
         <mkdir dir="${build.temp.dir}" />
         <if>
             <available type="dir" file="${basedir}/tests/src"/>
@@ -236,6 +248,7 @@
         </if>
     </target>
     
+    
     <target name="antunit">
         <mkdir dir="${build.temp.dir}" />
         <if>
@@ -259,13 +272,23 @@
                                 </instrpath>
                             </instr>
                         </emma>
+                        <pathconvert pathsep="${path.separator}" property="python.path">
+                            <fileset dir="${lib.dir}" includes="**/*.egg"/>
+                            <dirset dir="${lib.dir}"/>
+                        </pathconvert>
                         <exec osfamily="windows" executable="cmd" dir="${basedir}/tests" failonerror="true">
-                            <env key="ANT_ARGS" value="-lib ${lib.dir} -lib ${module.temp.dir}/backup/${ant.project.name}.jar -lib ${builder.dir}/antlibs" />
-                            <arg line="/c build.bat unittest -Dbuilder.dir=${builder.dir}" />
+                            <env key="ANT_ARGS" value="-lib ${lib.dir} -lib ${module.temp.dir}/backup/${ant.project.name}.jar -lib ${builder.dir}/antlibs -Dpython.path=${python.path}" />
+                            <env key="PYTHONPATH" value="${python.path}" />
+                            <env key="JYTHONPATH" value="${python.path}" />
+                            <arg line="/c build.bat unittest " />
+                            <arg value="-Dbuilder.dir=${builder.dir}" />
                         </exec>
                         <exec osfamily="unix" executable="./bld.sh" dir="${basedir}/tests" failonerror="true">
-                            <env key="ANT_ARGS" value="-lib ${lib.dir} -lib ${module.temp.dir}/backup/${ant.project.name}.jar -lib ${builder.dir}/antlibs" />
-                            <arg line="unittest -Dbuilder.dir=${builder.dir}" />
+                            <env key="ANT_ARGS" value="-lib ${lib.dir} -lib ${module.temp.dir}/backup/${ant.project.name}.jar -lib ${builder.dir}/antlibs -Dpython.path=${python.path}" />
+                            <env key="PYTHONPATH" value="${python.path}" />
+                            <env key="JYTHONPATH" value="${python.path}" />
+                            <arg line="unittest" />
+                            <arg value="-Dbuilder.dir=${builder.dir}" />
                         </exec>
                         <move todir="${module.temp.dir}">
                             <fileset dir="${basedir}/tests" includes="**/coverage.ec" />
@@ -320,6 +343,10 @@
             </then>
         </if>
     </target>
+    
+    
     <target name="unittest" depends="antunit"/>
     
 </project>
+
+

--- a/buildframework/helium/builder/python/macros.ant.xml	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/builder/python/macros.ant.xml	Wed Jun 16 16:51:40 2010 +0300
@@ -29,6 +29,7 @@
     <property name="nose.result.dir" location="${module.temp.dir}/xunit/nose" />
 
     <target name="resolve">
+        <mkdir dir="${lib.dir}" />
         <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
         
         <!-- the call to resolve is not mandatory, retrieve makes an implicit call if we don't -->

--- a/buildframework/helium/config/diamonds_config.xml.ftl	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/config/diamonds_config.xml.ftl	Wed Jun 16 16:51:40 2010 +0300
@@ -49,6 +49,8 @@
             logfile="${ant['temp.build.dir']}/build/doc/ivy/tool-dependencies-${ant['build.type']}.xml" ant-properties="true"/>        
 
         <target name="compile-main" />
+        
+        <target name="build-roms" />
             
         <target name="ido-codescanner" template-file="codescanner.xml.ftl"
             logfile="${ant['ido.codescanner.output.dir']}/problemIndex.xml"/>
@@ -76,6 +78,9 @@
         <target name="check-tool-dependencies" template-file="tool.xml.ftl" 
             logfile="${ant['temp.build.dir']}/build/doc/ivy/tool-dependencies-${ant['build.type']}.xml" ant-properties="true"
             defer="true"/>
+            
+        <target name="cmt-generate-diamond-summary"/>
+        
     </targets>
 </logger>
 </configuration>
\ No newline at end of file

--- a/buildframework/helium/config/ivy/ivy.xml	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/config/ivy/ivy.xml	Wed Jun 16 16:51:40 2010 +0300
@@ -59,7 +59,7 @@
         
         <!-- IDO dependencies -->
         <dependency org="SWEPT" name="7zip" rev="4" conf="ido->default"/>
-        <dependency org="SWEPT" name="ccm" rev="6.5" conf="ido->default"/>
+        <dependency org="SWEPT" name="ccm" rev="exactlyAnyOne(6.5, 7.1)" conf="ido->default"/>
         <dependency org="SWEPT" name="codescanner" rev="[2.0,2.1]" conf="ido->default"/>
         <dependency org="SWEPT" name="java13" rev="1.3.1" conf="ido->default"/>
         <dependency org="SWEPT" name="sbs" rev="2.12" conf="ido->default"/>

--- a/buildframework/helium/config/ivy/modules/ccm-6.5.ivy.xml	Tue Apr 27 08:33:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-============================================================================ 
-Name        : ccm-6.5.ivy.xml 
-Part of     : Helium 
-
-Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-All rights reserved.
-This component and the accompanying materials are made available
-under the terms of the License "Eclipse Public License v1.0"
-which accompanies this distribution, and is available
-at the URL "http://www.eclipse.org/legal/epl-v10.html".
-
-Initial Contributors:
-Nokia Corporation - initial contribution.
-
-Contributors:
-
-Description:
-
-============================================================================
--->
-<ivy-module version="1.3">
-    <info organisation="SWEPT"
-          module="ccm"
-          revision="6.5"/>
-    <publications>
-        <artifact name="ccm.exe" type="exe" versionArgs="version -c"/> 
-    </publications>
-</ivy-module>
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildframework/helium/config/ivy/modules/ccm-6.5_7.1.ivy.xml	Wed Jun 16 16:51:40 2010 +0300
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+============================================================================ 
+Name        : ccm-6.5_7.1.ivy.xml 
+Part of     : Helium 
+
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+Initial Contributors:
+Nokia Corporation - initial contribution.
+
+Contributors:
+
+Description:
+
+============================================================================
+-->
+<ivy-module version="1.3">
+    <info organisation="SWEPT"
+          module="ccm"
+          revision="6.5_7.1"/>
+    <publications>
+        <artifact name="ccm" type="exe" versionArgs="version -c" versionExp=".*(6\.5|7\.1).*" /> 
+    </publications>
+</ivy-module>
+

--- a/buildframework/helium/config/ivy/tools_ivy_settings.xml	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/config/ivy/tools_ivy_settings.xml	Wed Jun 16 16:51:40 2010 +0300
@@ -24,6 +24,8 @@
 <ivysettings>
     
     <typedef name="tool" classname="com.nokia.ivy.ToolResolver"/>
+    <typedef name="version-range" classname="org.apache.ivy.plugins.version.VersionRangeMatcher"/>
+    
     <caches useOrigin="true"/>
     <settings validate="false" defaultResolver="external"/>
     
@@ -41,7 +43,7 @@
         <url name="helium-svn">
             <ivy pattern="http://helium.nmp.nokia.com/svn/[module]/branches/[revision]/bin/ivy.xml" />
         </url>
-
+        
         <dual name="tool-resolver">
             <filesystem name="ivy-tool-resolver">
                 <ivy pattern="${helium.dir}/config/ivy/modules/[module]-[revision].ivy.xml" />
@@ -53,21 +55,20 @@
         </dual>
     </resolvers>
 
-    
     <triggers>
         <ant-build  antfile="${helium.dir}/config/ivy/install/build-[artifact].ant.xml"
-                    target="install"
-                       event="post-download-artifact"
-                       prefix="artifact"/>
+                target="install"
+                event="post-download-artifact"
+                prefix="artifact"/>
                        
-      <ant-call target="unzip-egg" prefix="artifact"
-          event="post-download-artifact" filter="ext=zip AND type=egg"/>
-      <ant-call target="unzip-jar" prefix="artifact"
-          event="post-download-artifact" filter="ext=zip AND type=jar"/>
-      <ant-call target="gunzip-egg" prefix="artifact"
-          event="post-download-artifact" filter="ext=tar.gz AND type=egg"/>
-      <ant-call target="bunzip-egg" prefix="artifact"
-          event="post-download-artifact" filter="ext=tar.bz2 AND type=egg"/>
+        <ant-call target="unzip-egg" prefix="artifact"
+                event="post-download-artifact" filter="ext=zip AND type=egg"/>
+        <ant-call target="unzip-jar" prefix="artifact"
+                event="post-download-artifact" filter="ext=zip AND type=jar"/>
+        <ant-call target="gunzip-egg" prefix="artifact"
+                event="post-download-artifact" filter="ext=tar.gz AND type=egg"/>
+        <ant-call target="bunzip-egg" prefix="artifact"
+                event="post-download-artifact" filter="ext=tar.bz2 AND type=egg"/>
     </triggers>
 
     
@@ -78,4 +79,11 @@
         <module organisation="helium-external" name=".*" resolver="helium-svn" />
     </modules>
     
+    <version-matchers>
+        <pattern-vm>
+            <match revision="exactlyAnyOne" pattern="${minor}_${major}" args="minor, major" matcher="regexp" />     
+        </pattern-vm>    
+        <version-range/>
+    </version-matchers>
+
 </ivysettings>

--- a/buildframework/helium/config/metadata_filter_config_default.ant.xml	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/config/metadata_filter_config_default.ant.xml	Wed Jun 16 16:51:40 2010 +0300
@@ -57,6 +57,11 @@
         <metadatafilterset refid="filterset.common" />
     </hlm:metadatafilterset>
 
+    <hlm:metadatafilterset id="filterset.sbs.cli">
+        <metadatafilter priority="error" regex="^sbs:\s+error:.*" description="sbs cli error" />
+        <metadatafilter priority="warning" regex="^sbs:\s+warning:.*" description="sbs cli warning" />
+    </hlm:metadatafilterset>
+
     <hlm:metadatafilterset id="filterset.compile">
         <metadatafilterset refid="filterset.common" />
         <hlm:metadatafilterset refid="filterset.compile.abld.deprecated" />

--- a/buildframework/helium/config/signaling_config_default.ant.xml	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/config/signaling_config_default.ant.xml	Wed Jun 16 16:51:40 2010 +0300
@@ -25,8 +25,6 @@
     Definitions of helium signals. 
     </description>
     
-    <taskdef resource="org/apache/tools/ant/types/conditions/antlib.xml" />
-
     <!-- Only for backward compatibility -->
     <hlm:notifierList id="defaultSignalFailNotifier">
         <hlm:emailNotifier templateSrc="${helium.dir}/tools/common/templates/log/email_new.html.ftl" title="[signal] ${signal.name} - [message] ${signal.message}"

--- a/buildframework/helium/config/version.txt	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/config/version.txt	Wed Jun 16 16:51:40 2010 +0300
@@ -1,5 +1,5 @@
 #Helium version - DO NOT EDIT
 #Fri Dec 18 15:07:03 EET 2009
-last.major.helium.version=8.0
-second.last.major.helium.version=7.0
-helium.version=9.0
+last.major.helium.version=9.0
+second.last.major.helium.version=8.0
+helium.version=10.0.0

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildframework/helium/doc/api_rst/antlib.rst.ftl	Wed Jun 16 16:51:40 2010 +0300
@@ -0,0 +1,85 @@
+<#--
+============================================================================ 
+Name        : antlib.rst.ftl
+Part of     : Helium 
+
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+Initial Contributors:
+Nokia Corporation - initial contribution.
+
+Contributors:
+
+Description:
+
+============================================================================
+-->
+<#include "api.ftllib"/>
+
+<#list doc.antDatabase.antlib as antlib>
+<@pp.changeOutputFile name="antlib-${antlib.name}.rst" />
+
+
+.. index::
+   ${antlib.name}
+    
+==========================================================
+Antlib ${antlib.name}
+==========================================================
+
+.. contents::
+
+:Location: <@helium_api_location_path location="${antlib.location}"/>
+
+<#if antlib.macro?size &gt; 0>
+
+Macros
+===========
+
+<#assign macroCache = {}>
+<#list antlib.macro as macro>
+    <#assign macroCache = macroCache + {macro.name: macro}>
+</#list>
+
+<#list macroCache?keys?sort as name>
+<#assign macro=macroCache[name]>
+
+.. index::
+   ${macro.name}
+
+${macro.name}
+----------------------------------------------------------
+
+<#if macro.deprecated?length &gt; 0>
+..warning:: ${macro.deprecated}
+</#if>
+
+:Location: <@helium_api_location_path location="${macro.location}"/>
+:Scope: ${macro.scope}
+
+<#recurse macro.documentation>
+
+**Usage**
+
+::
+
+    ${macro.usage?replace("^", "    ", "rm")}
+
+**Source code**
+
+::
+
+    ${macro.source?replace("^", "    ", "rm")}
+
+</#list>
+</#if>
+
+</#list>
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildframework/helium/doc/api_rst/api.ftllib	Wed Jun 16 16:51:40 2010 +0300
@@ -0,0 +1,80 @@
+<#--
+============================================================================ 
+Name        : 
+Part of     : Helium 
+
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+Initial Contributors:
+Nokia Corporation - initial contribution.
+
+Contributors:
+
+Description:
+
+============================================================================
+-->
+
+<#if ant?keys?seq_contains("tracurl")>
+    <#assign helium_browser_trunk=ant.tracurl>
+<#else>
+    <#assign helium_browser_trunk="">
+</#if>
+
+<#macro helium_api_location_path location>
+    <#assign target_line=""/>
+    <#assign res = location?matches(":(\\d+):$") />
+    <#list res as m>
+        <#assign target_line="#L${m?groups[1]}"/>
+    </#list>      
+    <#assign location_path=location/>
+    <#if location?index_of("helium\\") &gt; 0>
+        <#assign location_path=location?substring(location?last_index_of('helium\\'))/>
+    </#if>
+<#--       <#assign target_url=location_path?replace("\\", "/")?replace(":(\\d+):", "", 'ri') />
+    <tt class="docutils literal"><a href="${helium_browser_trunk}/${target_url}${target_line}">${location_path}</a></tt>-->
+    ``${location_path}``
+</#macro>
+
+<#macro helium_project_path location>
+    <#assign location_path=location/>
+    <#if location?index_of("helium\\") &gt; 0>
+        <#assign location_path=location?substring(location?last_index_of('helium\\'))/>
+    </#if>
+       <#assign target_url=location_path?replace("\\", "/")?replace(":(\\d+):", "", 'ri') />
+    <tt class="docutils literal"><a href="${helium_browser_trunk}/${target_url}">${target_url}</a></tt>  
+</#macro>
+
+<#-- Macros for recursively handling random HTML elements inside documentation elements. -->
+<#macro tt> <tt><#recurse></tt> </#macro>
+
+<#macro div><#recurse></#macro>
+
+<#macro p><#recurse>
+
+</#macro>
+
+<#macro ul>
+
+<#recurse>
+
+</#macro>
+
+<#macro li>    - <#recurse>
+</#macro>
+
+<#macro b>**<#recurse>**</#macro>
+
+<#macro pre>
+
+    <#recurse>
+    
+</#macro>
+
+<#macro @text>${.node?trim}</#macro>
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildframework/helium/doc/api_rst/index.rst.ftl	Wed Jun 16 16:51:40 2010 +0300
@@ -0,0 +1,35 @@
+<#--
+============================================================================ 
+Name        : packages.rst.ftl
+Part of     : Helium 
+
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+Initial Contributors:
+Nokia Corporation - initial contribution.
+
+Contributors:
+
+Description:
+
+============================================================================
+-->
+<#include "api.ftllib"/>
+
+Helium API Packages
+============================================
+
+.. toctree::
+   :maxdepth: 2
+   
+<#list doc.antDatabase.package as package>
+   package-${package.name}
+
+</#list>
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildframework/helium/doc/api_rst/macros_list.rst.ftl	Wed Jun 16 16:51:40 2010 +0300
@@ -0,0 +1,43 @@
+<#--
+============================================================================ 
+Name        : macros_list.rst.ftl
+Part of     : Helium 
+
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+Initial Contributors:
+Nokia Corporation - initial contribution.
+
+Contributors:
+
+Description:
+
+============================================================================
+-->
+
+=============
+Macros list
+=============
+
+<#assign macroCache = {}>
+<#list doc.antDatabase.project.macro as macro>
+    <#assign macroCache = macroCache + {macro.name: macro}>
+</#list>
+<#list doc.antDatabase.antlib.macro as macro>
+    <#assign macroCache = macroCache + {macro.name: macro}>
+</#list>
+
+.. csv-table:: Helium macros
+   :header: "Macro", "Project", "Summary"
+   
+<#list macroCache?keys?sort as name>
+<#assign macro=macroCache[name]>
+    ":hlm-t:`${name}`", "${macro?parent.name}", "${macro.summary?replace("^", "    ", "rm")?replace("\"", "\"\"", "rm")?trim}"
+</#list>
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildframework/helium/doc/api_rst/package.rst.ftl	Wed Jun 16 16:51:40 2010 +0300
@@ -0,0 +1,49 @@
+<#--
+============================================================================ 
+Name        : package.rst.ftl
+Part of     : Helium 
+
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+Initial Contributors:
+Nokia Corporation - initial contribution.
+
+Contributors:
+
+Description:
+
+============================================================================
+-->
+<#include "api.ftllib"/>
+   
+<#list doc.antDatabase.package as package>
+<@pp.changeOutputFile name="package-${package.name}.rst" />
+
+.. index::
+   ${package.name}
+   
+==========================================================
+Package ${package.name}
+==========================================================
+
+.. toctree::
+   :maxdepth: 2
+   
+<#assign projectList=package.projectRef.name?sort>
+<#list projectList as project>
+   project-${project}
+</#list>
+<#assign antlibList=package.antlibRef.name?sort>
+<#list antlibList as antlib>
+   antlib-${antlib}
+</#list>
+
+
+</#list>
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildframework/helium/doc/api_rst/project.rst.ftl	Wed Jun 16 16:51:40 2010 +0300
@@ -0,0 +1,204 @@
+<#--
+============================================================================ 
+Name        : project.rst.ftl
+Part of     : Helium 
+
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+Initial Contributors:
+Nokia Corporation - initial contribution.
+
+Contributors:
+
+Description:
+
+============================================================================
+-->
+<#include "api.ftllib"/>
+
+<#list doc.antDatabase.project as project>
+<@pp.changeOutputFile name="project-${project.name}.rst" />
+
+
+.. index::
+   ${project.name}
+    
+==========================================================
+Project ${project.name}
+==========================================================
+
+.. contents::
+
+:Location: <@helium_api_location_path location="${project.location}"/>
+
+<#recurse project.description>
+
+**Project dependencies**
+
+<#assign filelist = project.projectDependency>
+<#list filelist as filelistvar>
+- ``${filelistvar}``
+</#list>
+
+Targets
+=========
+
+<#assign targetCache = {}>
+<#list project.target as target>
+    <#assign targetCache = targetCache + {target.name: target}>
+</#list>
+
+<#list targetCache?keys?sort as name>
+<#assign target=targetCache[name]>
+
+.. index::
+   ${target.name}
+  
+${target.name}
+----------------------------------------------------------
+
+<#if target.deprecated?length &gt; 0>
+..warning:: ${target.deprecated}
+</#if>
+
+<#if target.description?length &gt; 0>
+:Description: ${target.description}
+</#if>
+:Location: <@helium_api_location_path location="${target.location}"/>
+:Scope: ${target.scope}
+<#if target.ifDependency?length &gt; 0>
+:Condition: Target **is** run if property defined: :hlm-p:`${target.ifDependency}`
+</#if>
+<#if target.unlessDependency?length &gt; 0>
+:Condition: Target **is not** run if property defined: ``${target.unlessDependency}``
+</#if>
+
+<#recurse target.documentation>
+
+<#assign propertyList=target.propertyDependency?sort>   
+<#if propertyList?size &gt; 0>
+**Property dependencies**
+
+<#list propertyList as property>
+- :hlm-p:`${property}`
+</#list>
+</#if>
+
+
+**Target dependencies**
+
+.. raw:: html
+
+  <img src="../../api/helium/target-${target.name}.dot.png" alt="target-${target.name}" usemap="#target-${target.name}" style="border-style: none"/>
+  <map name="target-${target.name}" id="target-${target.name}">
+   
+.. raw:: html
+  :file: ../../api/helium/target-${target.name}.dot.cmap
+   
+.. raw:: html
+
+  </map>  
+  
+**Source code**
+
+::
+
+    ${target.source?replace("^", "    ", "rm")}
+
+</#list>
+
+
+<#if project.property?size &gt; 0>
+
+Properties
+===========
+
+<#assign propertyCache = {}>
+<#list project.property as property>
+    <#assign propertyCache = propertyCache + {property.name: property}>
+</#list>
+
+<#list propertyCache?keys?sort as name>
+<#assign property=propertyCache[name]>
+
+.. index::
+   ${property.name}
+   
+${property.name}
+----------------------------------------------------------
+
+<#if property.deprecated?length &gt; 0>
+..warning:: ${property.deprecated}
+</#if>
+
+:Location: <@helium_api_location_path location="${property.location}"/>
+:Type: ${property.type}
+:Scope: ${property.scope}
+:Editable: ${property.editable}
+<#if property.defaultValue?size &gt; 1>
+:Default value: ``${property.defaultValue}``
+</#if>
+
+<#recurse property.documentation>
+
+**Source code**
+
+::
+
+    ${property.source}
+
+</#list>
+</#if>
+
+<#if project.macro?size &gt; 0>
+
+Macros
+===========
+
+<#assign macroCache = {}>
+<#list project.macro as macro>
+    <#assign macroCache = macroCache + {macro.name: macro}>
+</#list>
+
+<#list macroCache?keys?sort as name>
+<#assign macro=macroCache[name]>
+
+.. index::
+   ${macro.name}
+
+${macro.name}
+----------------------------------------------------------
+
+<#if macro.deprecated?length &gt; 0>
+..warning:: ${macro.deprecated}
+</#if>
+
+:Location: <@helium_api_location_path location="${macro.location}"/>
+:Scope: ${macro.scope}
+
+<#recurse macro.documentation>
+
+**Usage**
+
+::
+
+    ${macro.usage?replace("^", "    ", "rm")}
+
+**Source code**
+
+::
+
+    ${macro.source?replace("^", "    ", "rm")}
+
+</#list>
+</#if>
+
+</#list>
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildframework/helium/doc/api_rst/properties_list.rst.ftl	Wed Jun 16 16:51:40 2010 +0300
@@ -0,0 +1,40 @@
+<#--
+============================================================================ 
+Name        : properties_list.rst.ftl
+Part of     : Helium 
+
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+Initial Contributors:
+Nokia Corporation - initial contribution.
+
+Contributors:
+
+Description:
+
+============================================================================
+-->
+
+===============
+Properties list
+===============
+
+<#assign propertyCache = {}>
+<#list doc.antDatabase.project.property as property>
+    <#assign propertyCache = propertyCache + {property.name: property}>
+</#list>
+
+.. csv-table:: Helium properties
+   :header: "Property", "Project", "Summary"
+   
+<#list propertyCache?keys?sort as name>
+<#assign property=propertyCache[name]>
+    ":hlm-t:`${name}`", "${property?parent.name}", "${property.summary?replace("^", "    ", "rm")?replace("\"", "\"\"", "rm")?trim}"
+</#list>
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildframework/helium/doc/api_rst/target-dependencies.dot.ftl	Wed Jun 16 16:51:40 2010 +0300
@@ -0,0 +1,105 @@
+<#--
+============================================================================ 
+Name        : 
+Part of     : Helium 
+
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+Initial Contributors:
+Nokia Corporation - initial contribution.
+
+Contributors:
+
+Description:
+
+============================================================================
+-->
+<#list doc.antDatabase.project as project>
+<#list project.target as target>
+<@pp.changeOutputFile name="target-${target.name}.dot" />
+
+strict digraph G {
+    rankdir=LR;
+    rotate=180;
+    ordering=out;
+<#assign currentTarget = target.name>
+
+<#macro targetFunc targetMain caller>
+<#-- Define the targets that call this target. -->
+<#if caller == 0>
+    "${targetMain.name}" [fontcolor=blue,fontsize=12,shape=box,style=filled,href="project-${targetMain?parent.name}.html#${targetMain.name}"];
+    <#list doc.antDatabase.project.target as callingTarget>
+        <#list callingTarget.dependency as dependency>
+            <#if targetMain.name == dependency>
+                <#if callingTarget.name != currentTarget>
+                    "${callingTarget.name}" [fontcolor=brown,fontsize=12,shape=box,href="project-${callingTarget?parent.name}.html#${callingTarget.name}"];
+                </#if>
+                <#if dependency.@type == "direct">
+                    "${callingTarget.name}" -> "${targetMain.name}" [color=navyblue,fontsize=12];
+                </#if>
+                <#if dependency.@type == "exec">
+                    "${callingTarget.name}" -> "${targetMain.name}" [color=limegreen,fontsize=12];
+                </#if>
+            </#if>
+        </#list>
+    </#list>
+</#if>
+<#if caller == 1>
+    "${targetMain.name}" [fontcolor=brown,fontsize=12,shape=box,href="project-${targetMain?parent.name}.html#${targetMain.name}"];
+</#if>
+
+<#if targetMain.dependency?size == 1>
+    <#list targetMain.dependency as dependency>
+    "${dependency}" [fontcolor=brown,fontsize=12,shape=box,href="project-${targetMain?parent.name}.html#${dependency}"];
+    </#list>
+</#if>
+
+<#assign depTotal=targetMain.dependency?size>
+<#assign depLastIndex=targetMain.dependency?size-1>
+
+<#if depTotal &gt; 1>
+    <#list 0..depLastIndex as index>
+        <#if targetMain.dependency[index].@type == "direct">
+        "${targetMain.name}" -> "${targetMain.dependency[index]}" [color=navyblue,label="${index+1}",fontsize=12];
+        </#if>
+        <#if targetMain.dependency[index].@type == "exec">
+        "${targetMain.name}" -> "${targetMain.dependency[index]}" [color=limegreen,label="${index+1}",fontsize=12];
+        </#if>
+        <#list doc.antDatabase.project.target as targetDep>
+            <#if targetDep.name == targetMain.dependency[index]>
+            <@targetFunc targetMain=targetDep caller=1 />
+            </#if>
+        </#list>
+    </#list>
+</#if>
+
+<#attempt>
+<#if depTotal == 1>
+    <#if targetMain.dependency.@type == "direct">
+    "${targetMain.name}" -> "${targetMain.dependency[depTotal-1]}" [color=navyblue];
+    </#if>
+    <#if targetMain.dependency.@type == "exec">
+    "${targetMain.name}" -> "${targetMain.dependency[depTotal-1]}" [color=limegreen];
+    </#if>
+    <#list doc.antDatabase.project.target as targetDep>
+        <#if targetDep.name == targetMain.dependency>
+        <@targetFunc targetMain=targetDep caller=1 />
+        </#if>
+    </#list>
+</#if>
+<#recover>
+
+</#attempt>
+
+</#macro>
+
+<@targetFunc targetMain=target caller=0 />
+}
+</#list>
+</#list>
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildframework/helium/doc/api_rst/targets_list.rst.ftl	Wed Jun 16 16:51:40 2010 +0300
@@ -0,0 +1,40 @@
+<#--
+============================================================================ 
+Name        : targets_list.rst.ftl
+Part of     : Helium 
+
+Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+Initial Contributors:
+Nokia Corporation - initial contribution.
+
+Contributors:
+
+Description:
+
+============================================================================
+-->
+
+=============
+Targets list
+=============
+
+<#assign targetCache = {}>
+<#list doc.antDatabase.project.target as target>
+    <#assign targetCache = targetCache + {target.name: target}>
+</#list>
+
+.. csv-table:: Helium targets
+   :header: "Target", "Project", "Summary"
+   
+<#list targetCache?keys?sort as name>
+<#assign target=targetCache[name]>
+    ":hlm-t:`${name}`", "${target?parent.name}", "${target.summary?replace("^", "    ", "rm")?replace("\"", "\"\"", "rm")?trim}"
+</#list>
+
+