FCL/sftools/dev/build: comparison buildframework/helium/tools/compile/compile.antlib.xml

equal deleted inserted replaced

-:be27ed110b50
+:d8ac696cc51f
 <!-- This task transfer the log file into html format -->
 <macrodef name="compileHtmlscanlogMacro" uri="http://www.nokia.com/helium">
 <attribute name="input"/>
 <attribute name="output"/>
 <sequential>
-<exec dir="${build.drive}/" executable="perl" failonerror="${failonerror}">
+<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="@{input}"/>
 <not>
 <isset property="skip.diamonds"/>
 </not>
 <then>
 <fmpp sourceFile="${helium.dir}/tools/common/templates/diamonds/faults_metadata.ftl"
-outputfile="${build.log.dir}/compile-main.xml">
+outputfile="${diamonds.build.output.dir}/compile-main.xml">
 <data expandProperties="yes">
 dbPath: ${metadata.dbfile}
 logpath: @{logfile}
 ant: antProperties()
 </data>
 </macrodef>
 <macrodef name="compileLogSignalMacro" uri="http://www.nokia.com/helium">
 <attribute name="compile.summary.file"/>
 <attribute name="error.limit"/>
+<attribute name="phase" default="compile"/>
 <sequential>
 <hlm:metadataCountSeverity severity="ERROR" log="@{compile.summary.file}"
 db="${metadata.dbfile}"
 property="build.errors.total"/>
 <echo message="${build.errors.limit}" />
 <echo message="@{error.limit}" />
 <if>
 <scriptcondition language="jython" value="false">
 errorsTotal = project.getProperty("build.errors.total")
-errorsLimit = project.getProperty("build.errors.limit")
+if int(r'@{error.limit}') > -1:
-if int(errorsLimit) > -1:
+if int(errorsTotal) > int(r'@{error.limit}'):
-if int(errorsTotal) > int(errorsLimit):
 self.setValue(1)
 </scriptcondition>
 <then>
 <property name="compile.result" value="1"/>
 </then>
 <property name="compile.result" value="0"/>
 </else>
 </if>
 <echo message="compile result:${compile.result}" />
 <hlm:signalMacro skip.count="true" result="${compile.result}"
 logfile="@{compile.summary.file}"
+phase="@{phase}"
 signal.input="${compile.signal.input}" />
 </sequential>
 </macrodef>
 <!-- Macro to start the build using EBS. Parameters are generated xml file for EBS builds
 the build environment.
 -->
 <macrodef name="compileGenxmlMergeMacro" uri="http://www.nokia.com/helium">
 <attribute name="input"/>
 <attribute name="output"/>
-<sequential>
+<attribute name="logfile"/>
+<sequential>
+<echo message="input:@{input}" />
+<echo message="output:@{output}" />
+<mkdir dir="${compile.log.dir}"/>
+<mkdir dir="${temp.build.dir}"/>
 <copy todir="${build.drive}/" verbose="true">
 <fileset dir="${helium.dir}/tools/common/dtd" includes="*.dtd"/>
 </copy>
-<preset.exec executable="perl" dir="${build.drive}/" failonerror="${failonerror}" output="${build.log.dir}/${build.id}.sysdef_GenxmlMerge.log">
+<preset.exec executable="perl" dir="${build.drive}/" failonerror="${failonerror}" output="@{logfile}">
 <arg value="${epocroot}epoc32/tools/build/genxml.pl"/>
 <arg value="-s"/>
 <arg value="${epocroot}"/>
 <arg value="-m"/>
 <arg value="@{output}"/>
 <if>
 <not>
 <available file="@{output}"/>
 </not>
 <then>
+<echo file="@{logfile}" message="ERROR: Check @{input}" append="true"/>
 <!-- Todo: metadata: Make sure that logfilter is added to the filterset -->
 <hlm:metadatarecord database="${metadata.dbfile}">
 <hlm:textmetadatainput>
-<fileset casesensitive="false" file="${build.log.dir}/${build.id}.sysdef_GenxmlMerge.log" />
+<fileset casesensitive="false" file="@{logfile}" />
-<metadatafilterset>
-<metadatafilter priority="ERROR" regex="^ERROR:" description="genxml error" />
-<metadatafilter priority="ERROR" regex="^Context:" description="genxml context error" />
-</metadatafilterset>
 <metadatafilterset refid="filterset.genxml.merge" />
 </hlm:textmetadatainput>
 </hlm:metadatarecord>
 <hlm:generateBuildStatus file="${build.id}.sysdef_GenxmlMerge.log" />
 <hlm:signal name="canonicalSysDefFailSignal" result="1" >
 <signalNotifierInput>
-<signalInput refid="canonicalSysDefFailSignalInput" />
+<signalInput refid="canonicalSysDefFailSignalInput" >
-<notifierInput file = "${build.signal.status.dir}/${build.id}.sysdef_GenxmlMerge.log.status.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}.sysdef_GenxmlMerge.log*" />
+</fileset>
+</notifierInput>
+</signalInput>
 </signalNotifierInput>
 </hlm:signal>
 </then>
 </if>
 <attribute name="target"/>
 <attribute name="custom"/>
 <attribute name="dir"/>
 <attribute name="annodetail"/>
 <attribute name="root"/>
 <attribute name="failonerror"/>
+<attribute name="phase"/>
 self.setTaskName("emake");
 // check attributes
 if (attributes.get("name") == null)
 throw new org.apache.tools.ant.BuildException("name attribute is not defined");
 self.log("Name: " + attributes.get("name"));
 if (attributes.get("makefile") == null)
 throw new org.apache.tools.ant.BuildException("makefile attribute is not defined");
 self.log("Makefile: " + attributes.get("makefile"));
 String target = "all";
 String custom = "";
+String annofileDir = "";
 if (attributes.get("target") != null)
 target = attributes.get("target");
 self.log("Target: " + target);
 if (attributes.get("custom") != null)
 custom = attributes.get("custom");
 if (attributes.get("root") != null)
 root = attributes.get("root");
 else
 root = "";
 self.log("Custom: " + custom);
 // Create and configure exec target
 org.apache.tools.ant.taskdefs.ExecTask task = new org.apache.tools.ant.taskdefs.ExecTask();
+task.setProject(self.getProject());
 task.setTaskName(self.getTaskName());
 String emake = com.nokia.ant.util.Helper.getProperty(project, "ec.emake");
 task.setExecutable(emake);
 if (attributes.get("failonerror") != null) {
 task.setFailonerror(Boolean.parseBoolean(attributes.get("failonerror")));
 String heliumDir = com.nokia.ant.util.Helper.getProperty(project, "helium.dir");
 if (attributes.get("root") != null) {
 self.log("--emake-root=" + eroot + ";" + heliumDir + ";" + root);
 }
 task.createArg().setValue("--emake-root=" + eroot + ";" + heliumDir + ";" + root);
+if (attributes.get("phase") != null) {
+annofileDir = com.nokia.ant.util.Helper.getProperty(project, "build.log.dir") + "/" + attributes.get("phase");
+}
+else {
+annofileDir = com.nokia.ant.util.Helper.getProperty(project, "build.log.dir");
+}
 if (attributes.get("annodetail") != null) {
 task.createArg().setValue("--emake-annodetail=" + attributes.get("annodetail"));
-task.createArg().setValue("--emake-annofile=" + com.nokia.ant.util.Helper.getProperty(project, "build.log.dir") + "/" + buildId + "-" + attributes.get("name") + ".anno.xml");
+task.createArg().setValue("--emake-annofile=" + annofileDir + "/" + buildId + "-" + attributes.get("name") + ".emake.anno.xml");
 }
 task.createArg().setLine(custom);
 task.createArg().setLine("-f " + attributes.get("makefile"));
 task.createArg().setLine(target);
 // Execute.

changeset 179	d8ac696cc51f
parent 1	be27ed110b50
child 217	0f5e3a7fb6af
child 593	4367a1b2db65