--- a/buildframework/helium/tools/preparation/ido-prep.ant.xml Fri Feb 05 11:59:41 2010 +0000
+++ b/buildframework/helium/tools/preparation/ido-prep.ant.xml Thu Mar 04 15:10:37 2010 +0200
@@ -20,6 +20,7 @@
============================================================================
-->
+<!--* @package preparation -->
<project name="ido-prep" xmlns:hlm="http://www.nokia.com/helium">
<description>
IDO related targets.
@@ -29,11 +30,34 @@
* IBY export (old way)
</description>
+ <!-- Path to a INI file that contains the mapping between the ADO from Synergy WA and it's location on the BA.
+ @type string
+ @scope private
+ -->
<property name="ado.mapping.file" location="${build.output.dir}/build/ado_mapping.ini"/>
+ <!-- Path to a INI file that contains the mapping between the ADO from Synergy WA and it's location on the BA for quality targets.
+ @type string
+ @scope private
+ -->
<property name="ado.quality.mapping.file" location="${build.output.dir}/build/ado_quality_mapping.ini"/>
+ <!-- Path to the build romtree; the location contains iby files. Default value is "${build.drive}${env.EPOCROOT}/epoc32/rom/include"
+ @type string
+ @scope private
+ -->
<property name="ido.romtree" location="${build.drive}${env.EPOCROOT}/epoc32/rom/include" />
+ <!-- Path to the cenrep root. Default value is "${build.drive}${env.EPOCROOT}/epoc32/tools/cenrep/ido/src"
+ @type string
+ @scope private
+ -->
<property name="ido.cenrep.root" location="${build.drive}${env.EPOCROOT}/epoc32/tools/cenrep/ido/src" />
+ <!-- Path to the cenrep target directory. Default value is "${build.drive}${env.EPOCROOT}/epoc32/data/z/private/10202be9"
+ @type string
+ @scope private
+ -->
<property name="ido.cenrep.target" value="${build.drive}${env.EPOCROOT}/epoc32/data/z/private/10202be9" />
+ <!-- Defines the location of Codescanner output.
+ @type string
+ -->
<property name="ido.codescanner.output.dir" location="${build.output.dir}/${build.id}_codescanner"/>
<!-- Internal target that generates the '''ado.mapping.file'''.
@@ -69,41 +93,64 @@
<!-- Target to generate cenreps using cone tool -->
<target name="ido-gen-cenrep">
+ <mkdir dir="${post.log.dir}" />
<for list="${sysdef.configurations.list}" delimiter="," param="sysdef.config">
<sequential>
+ <var name="confml.log.file" unset="true"/>
<if>
- <available file="${compile.log.dir}/${build.id}.@{sysdef.config}_compile.log"/>
+ <or>
+ <equals arg1="${build.system}" arg2="sbs" />
+ <equals arg1="${build.system}" arg2="sbs-ec" />
+ </or>
<then>
- <hlm:grepMacro filename="${compile.log.dir}/${build.id}.@{sysdef.config}_compile.log" regexp="([^\\]*.confml)$" output="confml.file.list"/>
- <for list="${confml.file.list}" delimiter="," param="confml.file">
+ <hlm:getsbsinputs config="sbs.@{sysdef.config}" outputProperty="sbs.internal.inputs.list"/>
+ <for list="${sbs.internal.inputs.list}" delimiter="," param="sbs.input">
<sequential>
- <var name="crml.regexp" unset="true"/>
- <propertyregex property="crml.regexp" input="@{confml.file}" regexp="([^\.]*).confml" select="\1" />
- <hlm:conEToolMacro>
- <arg name="output" value="${post.log.dir}/${build.id}_cenrep.cone.log"/>
- <arg name="path" value="${build.drive}/epoc32/tools/" />
- <arg name="-v" value="5" />
- <arg name="-p" value="${build.drive}\epoc32\rom\config\assets\s60" />
- <arg name="-o" value="${build.drive}\epoc32\release\winscw\urel\z" />
- <arg name="-c" value="root.confml" />
- <arg name="-i" value="${crml.regexp}" />
- </hlm:conEToolMacro>
- <hlm:conEToolMacro>
- <arg name="output" value="${post.log.dir}/${build.id}_cenrep.cone.log"/>
- <arg name="path" value="${build.drive}/epoc32/tools/" />
- <arg name="-v" value="5" />
- <arg name="-p" value="${build.drive}\epoc32\rom\config\assets\s60" />
- <arg name="-o" value="${build.drive}\epoc32\release\winscw\udeb\z" />
- <arg name="-c" value="root.confml" />
- <arg name="-i" value="${crml.regexp}" />
- </hlm:conEToolMacro>
+ <hlm:getVariableValue name="--logfile" property="sbs.log.file">
+ <hlm:sbsinput refid="@{sbs.input}" />
+ </hlm:getVariableValue>
+ <property name="confml.log.file" value="${sbs.log.file}"/>
</sequential>
</for>
</then>
+ <else>
+ <property name="confml.log.file" value="${compile.log.dir}/${build.id}.@{sysdef.config}_compile.log"/>
+ </else>
</if>
</sequential>
</for>
- <copy file="${post.log.dir}/${build.id}_cenrep.cone.log" tofile="${temp.build.dir}/${build.id}_cenrep_includefile.txt" overwrite="true">
+ <echo>confml.log.file = ${confml.log.file}</echo>
+ <if>
+ <available file="${confml.log.file}"/>
+ <then>
+ <hlm:grepMacro filename="${confml.log.file}" regexp="([^\\/.]*?)\.confml" output="confml.file.list"/>
+ <for list="${confml.file.list}" delimiter="," param="confml.file">
+ <sequential>
+ <var name="crml.regexp" unset="true"/>
+ <echo>confml.file = @{confml.file}</echo>
+ <hlm:conEToolMacro>
+ <arg name="output" value="${post.log.dir}/${build.id}_cenrep.cone.log"/>
+ <arg name="path" value="${build.drive}/epoc32/tools/" />
+ <arg name="-v" value="5" />
+ <arg name="-p" value="${build.drive}\epoc32\rom\config\assets\s60" />
+ <arg name="-o" value="${build.drive}\epoc32\release\winscw\urel\z" />
+ <arg name="-c" value="root.confml" />
+ <arg name="-i" value="@{confml.file}" />
+ </hlm:conEToolMacro>
+ <hlm:conEToolMacro>
+ <arg name="output" value="${post.log.dir}/${build.id}_cenrep.cone.log"/>
+ <arg name="path" value="${build.drive}/epoc32/tools/" />
+ <arg name="-v" value="5" />
+ <arg name="-p" value="${build.drive}\epoc32\rom\config\assets\s60" />
+ <arg name="-o" value="${build.drive}\epoc32\release\winscw\udeb\z" />
+ <arg name="-c" value="root.confml" />
+ <arg name="-i" value="@{confml.file}" />
+ </hlm:conEToolMacro>
+ </sequential>
+ </for>
+ </then>
+ </if>
+ <copy file="${post.log.dir}/${build.id}_cenrep.cone.log" tofile="${temp.build.dir}/${build.id}_cenrep_includefile.txt" overwrite="true" failonerror="false">
<filterchain>
<linecontainsregexp>
<regexp pattern="^\s*Generating file"/>
@@ -225,6 +272,9 @@
-->
<target name="ido-codescanner" depends="ido-create-ado-mapping,ido-codescanner-skip" unless="do.skip.codescanner">
<!--hlm:iniKeys2Path ini="${ado.mapping.file}" pathid="ado.src.path"/-->
+ <!-- Defines the format of Codescanner output (html|xml|std).
+ @type string
+ -->
<property name="ido.codescanner.output.type" value="html"/>
<script language="jython" setbeans="false">
""" internal.codescanner.drive """
@@ -345,6 +395,61 @@
<runtarget target="ido-check-latest-release-dragonfly"/>
</target>
+ <!--* @property s60.grace.server
+ UNC path to GRACE server.
+ @type string
+ @editable required
+ @scope public
+ -->
+ <!--* @property s60.grace.service
+ GRACE service to look into.
+ @type string
+ @editable required
+ @scope public
+ -->
+ <!--* @property s60.grace.product
+ GRACE product to look into.
+ @type string
+ @editable required
+ @scope public
+ -->
+ <!--* @property s60.grace.release
+ Regular expression to match a particular GRACE realease.
+ @type string
+ @editable required
+ @scope public
+ -->
+ <!--* @property s60.grace.release.fixbuildregex
+ Regular expression to match a particular GRACE release fixbuilds. Example _(.*?)$ or _(\d+)$
+ @type string
+ @editable required
+ @scope public
+ -->
+ <!--* @property s60.grace.cache
+ Location of the Grace result cache for a builder.
+ @type string
+ @editable required
+ @scope public
+ -->
+ <!--* @property s60.grace.checkmd5
+ Enable MD5 validation for GRACE metadata (default: false).
+ @type boolean
+ @editable required
+ @scope public
+ -->
+ <!--* @property s60.grace.revision
+ Defined the regular expression to find a particular revision.
+ @type string
+ @editable required
+ @scope public
+ -->
+ <!--* @property s60.grace.usetickler
+ Enable the detection of ready release using GRACE tickler mechanism.
+ @type string
+ @editable required
+ @scope public
+ -->
+
<!-- Checks the contents from GRACE release. Mainly used by IDOs. But could be
extended to product builds.-->
<target name="ido-check-latest-release-grace" unless="use.dragonfly">