# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1255971377 -3600
# Node ID cdfb88270be0d5720e775c6570f9676d002e327e
# Parent 382728cd25d2fe5841cbf3c61239e4c5c2302772# Parent 9fe5b8f5bf5f26dbb90050b8249a8e75b3173c2b
Merge
diff -r 382728cd25d2 -r cdfb88270be0 common/build.postbuild.xml
--- a/common/build.postbuild.xml Mon Oct 19 17:55:16 2009 +0100
+++ b/common/build.postbuild.xml Mon Oct 19 17:56:17 2009 +0100
@@ -77,12 +77,15 @@
<!-- Zip up all the logs -->
<runtarget target="sf-zip-logs"/>
- <runtarget target="sf-brag-to-diamonds"/>
-
- <!-- Publish logs/reports -->
+
<if>
<istrue value="${sf.spec.publish.enable}" />
<then>
+ <echo message="Send links to Diamonds"/>
+ <runtarget target="sf-links-to-diamonds"/>
+ <echo message="Send BRAG status information to Diamonds"/>
+ <runtarget target="sf-brag-to-diamonds"/>
+
<echo message="Publish log files and reports to ${sf.spec.publish.rootdir}"/>
<runtarget target="sf-publish"/>
</then>
@@ -372,6 +375,7 @@
<arg value="--config=${raptorconfig}"/>
<arg value="--log=@{raptorlogfile}"/>
<arg value="--basedir=${build.log.dir}/raptorbits"/>
+ <arg value="--append"/>
</exec>
</sequential>
</for>
@@ -506,11 +510,18 @@
</target>
<target name="sf-run-analysis-diamonds">
- <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-run-analysis.xml.ftl" outputFile="${build.drive}/output/logs/sf-run-analysis.xml">
+ <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-run-analysis-diamonds.xml.ftl" outputFile="${build.drive}/output/logs/sf-run-analysis-diamonds.xml">
<data expandProperties="yes">
ant: antProperties()
raptor_summary: csv(${build.log.dir}/raptorbits/summary.csv,{separator:',',headers:[category,subcategory,severity,config,component,phase,recipe,file,line]})
- files: csv(${build.drive}/output/logs/analysis/tmp_yarp_files.csv,{separator:',',headers:[name,path,localpath]})
+ </data>
+ </fmpp>
+ </target>
+
+ <target name="sf-links-to-diamonds">
+ <fmpp sourceFile="${sf.common.config.dir}/diamonds/linksForDiamonds.xml.ftl" outputFile="${build.log.dir}/linksForDiamonds.xml">
+ <data expandProperties="yes">
+ ant: antProperties()
</data>
</fmpp>
<!-- Send the data to the server -->
@@ -521,9 +532,9 @@
<arg value="-u"/>
<arg value="${diamonds.build.id}"/>
<arg value="-f"/>
- <arg value="${build.log.dir}/sf-run-analysis.xml"/>
+ <arg value="${build.log.dir}/linksForDiamonds.xml"/>
</exec>
- </target>
+ </target>
<target name="sf-brag-to-diamonds">
<!-- Merge all our bits of XML together -->
@@ -786,10 +797,15 @@
</then>
</if>
<runtarget target="sf-zip-logs"/>
- <runtarget target="sf-brag-to-diamonds"/>
+
<if>
<istrue value="${sf.spec.publish.enable}" />
<then>
+ <echo message="Send links to Diamonds"/>
+ <runtarget target="sf-links-to-diamonds"/>
+ <echo message="Send BRAG status information to Diamonds"/>
+ <runtarget target="sf-brag-to-diamonds"/>
+
<echo message="Publish log files and reports to ${sf.spec.publish.rootdir}"/>
<runtarget target="sf-publish"/>
</then>
diff -r 382728cd25d2 -r cdfb88270be0 common/diamonds/config.xml.ftl
--- a/common/diamonds/config.xml.ftl Mon Oct 19 17:55:16 2009 +0100
+++ b/common/diamonds/config.xml.ftl Mon Oct 19 17:56:17 2009 +0100
@@ -42,7 +42,7 @@
<target name="diamonds" template-file="tool.xml.ftl"
logfile="${ant['temp.build.dir']}/build/doc/ivy/tool-dependencies-${ant['build.type']}.xml" ant-properties="true"/>
- <!-- note: replaced by sf-run-analysis -->
+ <!-- note: replaced by sf-run-analysis-diamonds -->
<!-- target name="compile-main" template-file="compile.xml.ftl"
logfile="${ant['diamonds.compile.summary']}" ant-properties="true"/ -->
@@ -73,7 +73,7 @@
<!-- SF specific -->
<target name="sf-diamonds-tag-build"/>
<target name="sf-diamondize-bom"/>
- <target name="sf-run-analysis"/>
+ <target name="sf-run-analysis-diamonds"/>
</targets>
</logger>
</configuration>
\ No newline at end of file
diff -r 382728cd25d2 -r cdfb88270be0 common/diamonds/linksForDiamonds.xml.ftl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/diamonds/linksForDiamonds.xml.ftl Mon Oct 19 17:56:17 2009 +0100
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<diamonds-build>
+ <schema>14</schema>
+ <files>
+ <file>
+ <type>log</type>
+ <name>BRAG Summary</name>
+ <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\summary\_brag.xml</url>
+ </file>
+ <file>
+ <type>log</type>
+ <name>Build BOM</name>
+ <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\build_BOM.zip</url>
+ </file>
+ <file>
+ <type>log</type>
+ <name>Build Logs</name>
+ <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\build_logs.zip</url>
+ </file>
+ </files>
+</diamonds-build>
\ No newline at end of file
diff -r 382728cd25d2 -r cdfb88270be0 common/diamonds/sf-run-analysis-diamonds.xml.ftl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/diamonds/sf-run-analysis-diamonds.xml.ftl Mon Oct 19 17:56:17 2009 +0100
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<diamonds-build>
+ <schema>14</schema>
+
+<#assign raptor_errors=0/>
+<#assign raptor_warnings=0/>
+<#list raptor_summary as raptor_item>
+<#if raptor_item.category = "raptor_error">
+ <#assign raptor_errors=raptor_errors+1 />
+<#elseif raptor_item.category = "raptor_warning">
+ <#assign raptor_warnings=raptor_warnings+1 />
+</#if>
+</#list>
+
+ <faults>
+ <total severity="Raptor Errors">${raptor_errors}</total>
+ <total severity="Raptor Warnings">${raptor_warnings}</total>
+ <total severity="Recipes Failed">${ant['sf.job.totalyarperrors']}</total>
+ </faults>
+</diamonds-build>
\ No newline at end of file
diff -r 382728cd25d2 -r cdfb88270be0 common/diamonds/sf-run-analysis.xml.ftl
--- a/common/diamonds/sf-run-analysis.xml.ftl Mon Oct 19 17:55:16 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<diamonds-build>
- <schema>10</schema>
-
-<#assign raptor_errors=0/>
-<#assign raptor_warnings=0/>
-<#list raptor_summary as raptor_item>
-<#if raptor_item.category = "raptor_error">
- <#assign raptor_errors=raptor_errors+1 />
-<#elseif raptor_item.category = "raptor_warning">
- <#assign raptor_warnings=raptor_warnings+1 />
-</#if>
-</#list>
-
- <faults>
- <total severity="Raptor Errors">${raptor_errors}</total>
- <total severity="Raptor Warnings">${raptor_warnings}</total>
- <total severity="Recipes Failed">${ant['sf.job.totalyarperrors']}</total>
- </faults>
-
- <files>
- <file>
- <type>log</type>
- <name>BRAG Summary</name>
- <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\summary\_brag.xml</url>
- </file>
- <file>
- <type>log</type>
- <name>Raptor summary</name>
- <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\logs\raptorbits\summary.csv</url>
- </file>
- <#list files as f>
- <file>
- <type>log</type>
- <name>${f.name}</name>
- <url>file:///${f.path}</url>
- </file>
- </#list>
- </files>
-
-</diamonds-build>
\ No newline at end of file
diff -r 382728cd25d2 -r cdfb88270be0 sf-package/symbian3_props.ant.xml
--- a/sf-package/symbian3_props.ant.xml Mon Oct 19 17:55:16 2009 +0100
+++ b/sf-package/symbian3_props.ant.xml Mon Oct 19 17:56:17 2009 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<project name="SYMBIAN3-PROPS">
- <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.a_alpha_FCL.120"/>
+ <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.a"/>
</project>