--- a/common/build.postbuild.xml Tue Oct 06 13:50:26 2009 +0100
+++ b/common/build.postbuild.xml Tue Oct 06 14:02:04 2009 +0100
@@ -487,6 +487,16 @@
files: csv(${build.drive}/output/logs/analysis/tmp_yarp_files.csv,{separator:',',headers:[name,path,localpath]})
</data>
</fmpp>
+ <!-- Send the data to the server -->
+ <exec executable="python">
+ <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/>
+ <arg value="-s"/>
+ <arg value="${diamonds.host}"/>
+ <arg value="-u"/>
+ <arg value="${diamonds.build.id}"/>
+ <arg value="-f"/>
+ <arg value="${build.log.dir}/sf-run-analysis.xml"/>
+ </exec>
</target>
<target name="sf-brag-to-diamonds">
@@ -511,10 +521,10 @@
<then>
<!-- Try to obtain the diamonds ID for this build -->
<if>
- <isset property="diamonds.build.id"/>
- <else>
- <property file="${build.log.dir}/diamonds.build.id.properties"/> <!-- This will fail silently -->
- </else>
+ <not><isset property="diamonds.build.id"/></not>
+ <then>
+ <property file="${build.log.dir}/diamonds_build_id.properties"/> <!-- This will fail silently -->
+ </then>
</if>
<if>
<isset property="diamonds.build.id"/>
@@ -525,7 +535,7 @@
<arg value="-s"/>
<arg value="${diamonds.host}"/>
<arg value="-u"/>
- <arg value="/diamonds/builds/${diamonds.build.id}"/>
+ <arg value="${diamonds.build.id}"/>
<arg value="-f"/>
<arg value="${temp.build.dir}/bragForDiamonds.xml"/>
</exec>
--- a/common/build.xml Tue Oct 06 13:50:26 2009 +0100
+++ b/common/build.xml Tue Oct 06 14:02:04 2009 +0100
@@ -203,8 +203,8 @@
<then>
<echo>[SF-DIAMONDS-CONNECT]</echo>
<runtarget target="diamonds"/>
- <echo message="Save Diamonds build id value in a file"/>
- <echo message="diamonds.build.id=${diamonds.build.id}" file="${build.log.dir}/diamonds_build_id.txt"/>
+ <echo message="Save Diamonds build id value (${diamonds.build.id}) in a file"/>
+ <echo message="diamonds.build.id=${diamonds.build.id}" file="${build.log.dir}/diamonds_build_id.properties"/>
</then>
</if>
</target>
--- a/common/diamonds/sf-run-analysis.xml.ftl Tue Oct 06 13:50:26 2009 +0100
+++ b/common/diamonds/sf-run-analysis.xml.ftl Tue Oct 06 14:02:04 2009 +0100
@@ -34,9 +34,9 @@
</file>
<file>
<type>log</type>
- <name>Build Summary</name>
- <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\build_summary.html</url>
+ <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>
- </files>
+ </files>
</diamonds-build>
\ No newline at end of file
--- a/sf-platform/build.xml Tue Oct 06 13:50:26 2009 +0100
+++ b/sf-platform/build.xml Tue Oct 06 14:02:04 2009 +0100
@@ -41,7 +41,7 @@
<copy file="${build.drive}/${sf.spec.bldmefirst.gt.variant}" tofile="${build.drive}/epoc32/tools/variant/variant.cfg" failonerror="true" verbose="true" preservelastmodified="true" />
<if><isset property="sf.spec.bldmefirst.gt.hrh.os"/>
<then>
- <copy file="${build.drive}/${sf.spec.bldmefirst.gt.hrh.os}" tofile="${build.drive}/epoc32/tools/variant/Symbian_OS.hrh" failonerror="false" overwrite="true" verbose="true" preservelastmodified="true" />
+ <copy file="${build.drive}/${sf.spec.bldmefirst.gt.hrh.os}" tofile="${build.drive}/epoc32/include/variant/Symbian_OS.hrh" failonerror="false" overwrite="true" verbose="true" preservelastmodified="true" />
</then>
</if>
</target>