--- a/common/build.xml Tue Feb 09 12:22:45 2010 +0000
+++ b/common/build.xml Tue Feb 09 19:26:23 2010 +0000
@@ -115,6 +115,11 @@
</target>
<target name="sf-check-env">
+ <!-- Dario's environment dumper -->
+ <exec executable="perl" dir="${build.drive}">
+ <arg value="${sf.common.config.dir}/tools/envinfo.pl"/>
+ </exec>
+
<!-- Conditional location of BuildEnv.xml. Project always preferred to default -->
<if><available file="${sf.project.location}/BuildEnv.xml"/>
<then>
@@ -207,7 +212,7 @@
</target>
<target name="sf-prebuild" depends="sf-prep,sf-prebuild-noprep"/>
- <target name="sf-prebuild-noprep" depends="sf-prebuild-announce,sf-diamonds-connect,sf-diamonds-tag-build,sf-getenvs,sf-syncsource,sf-diamondize-bom">
+ <target name="sf-prebuild-noprep" depends="sf-prebuild-announce,sf-diamonds-connect,sf-diamonds-envinfo,sf-diamonds-tag-build,sf-getenvs,sf-syncsource,sf-diamondize-bom">
<stopwatch name="sf-prebuild" action="elapsed"/>
</target>
@@ -227,6 +232,23 @@
</then>
</if>
</target>
+
+ <target name="sf-diamonds-envinfo">
+ <if>
+ <istrue value="${sf.spec.publish.enable}"/>
+ <then>
+ <echo>[SF-DIAMONDS-ENVINFO]</echo>
+ <echo message="Send ${build.log.dir}/diamonds_envinfo.xml to Diamonds"/>
+ <exec executable="python">
+ <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/>
+ <arg value="-u"/>
+ <arg value="http://${diamonds.host}${diamonds.build.id}"/>
+ <arg value="-f"/>
+ <arg value="${build.log.dir}/diamonds_envinfo.xml"/>
+ </exec>
+ </then>
+ </if>
+ </target>
<target name="sf-diamonds-tag-build">
<if>
--- a/common/diamonds/config.xml.ftl Tue Feb 09 12:22:45 2010 +0000
+++ b/common/diamonds/config.xml.ftl Tue Feb 09 19:26:23 2010 +0000
@@ -39,8 +39,9 @@
<stage name="release" start="publish-variants" end="final" />
</stages>
<targets>
- <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-diamonds-envinfo -->
+ <!-- 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-diamonds -->
<!-- target name="compile-main" template-file="compile.xml.ftl"
@@ -64,11 +65,12 @@
logfile="${ant['validate.policy.log']}"/>
</#if>
+ <!-- note: replaced by sf-diamonds-envinfo -->
<!-- defer will store all the converted output file and sends only if there any other
stage / target starts to send some data to diamonds -->
- <target name="check-tool-dependencies" template-file="tool.xml.ftl"
+ <!-- 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"/>
+ defer="true"/ -->
<!-- SF specific -->
<target name="sf-diamonds-tag-build"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/envinfo.pl Tue Feb 09 19:26:23 2010 +0000
@@ -0,0 +1,177 @@
+# Copyright (c) 2009 Symbian Foundation Ltd
+# 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:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Dumps environment info such as tools version to cmdline then to a Diamonds file
+
+use strict;
+
+use Getopt::Long;
+
+my $output = "\\output\\logs\\diamonds_envinfo.xml";
+my $help = 0;
+GetOptions((
+ 'out=s' => \$output,
+ 'help!' => \$help
+));
+
+if ($help)
+{
+ print "Dumps environment info such as tools version to cmdline then to a Diamonds file\n";
+ print "Usage: perl envinfo.pl --out=XMLFILE\n";
+ print "\n";
+ print "XMLFILE is optional, its default is \\output\\logs\\diamonds_envinfo.xml\n";
+ exit(0);
+}
+
+my @environment_info = ();
+
+# Machine name
+push @environment_info, {name=>'Machine', version=>$ENV{'COMPUTERNAME'}};
+
+# OS Name and Version
+my $os_name = 'N.A.';
+my $os_ver = 'N.A.';
+my $os_out = `systeminfo`;
+$os_name = $1 if ($os_out =~ /^OS Name:\s+(.*)/m);
+$os_ver = $1 if ($os_out =~ /^OS Version:\s+(.*)/m);
+push @environment_info, {name=>'OS Name', version=>$os_name};
+push @environment_info, {name=>'OS Version', version=>$os_ver};
+
+# Perl
+my $perl_ver = 'N.A.';
+my $perl_out = `perl -v`;
+$perl_ver = $1 if ($perl_out =~ /This is perl, v(\S+)/m);
+push @environment_info, {name=>'Perl', version=>$perl_ver};
+
+# Python
+my $python_ver = 'N.A.';
+my $python_out = `python -V 2>&1`;
+$python_ver = $1 if ($python_out =~ /^Python\s+(\S+)/m);
+push @environment_info, {name=>'Python', version=>$python_ver};
+
+# Mercurial
+my $hg_ver = 'N.A.';
+my $hg_out = `hg --version`;
+$hg_ver = $1 if ($hg_out =~ /^Mercurial Distributed SCM \(version ([^)]+)\)/m);
+push @environment_info, {name=>'Mercurial', version=>$hg_ver};
+
+# 7-Zip
+my $zip_ver = 'N.A.';
+my $zip_out = `7z`;
+$zip_ver = $1 if ($zip_out =~ /^7-Zip\s+(\S+)\s+Copyright/m);
+push @environment_info, {name=>'7-Zip', version=>$zip_ver};
+
+# Raptor
+my $sbs_ver = 'N.A.';
+my $sbs_out = `sbs -v`;
+$sbs_ver = $1 if ($sbs_out =~ /^sbs version (.*)/m);
+push @environment_info, {name=>'sbs', version=>$sbs_ver};
+
+# Metrowerk Compiler
+my $mwcc_ver = 'N.A.';
+my $mwcc_out = `mwccsym2 -version`;
+$mwcc_ver = $1 if ($mwcc_out =~ /^Version (.*) \(Build/m);
+push @environment_info, {name=>'mwccsym2', version=>$mwcc_ver};
+
+# RVCT 2.2
+my $rvct22_ver = 'N.A.';
+my $rvct22_path = '';
+if (defined $ENV{'SBS_RVCT22BIN'})
+{
+ $rvct22_path = $ENV{'SBS_RVCT22BIN'};
+}
+elsif (defined $ENV{'RVCT22BIN'})
+{
+ $rvct22_path = $ENV{'RVCT22BIN'};
+}
+my $rvct22_cmd = 'armcc 2>&1';
+$rvct22_cmd = "$rvct22_path\\$rvct22_cmd" if ($rvct22_path);
+my $rvct22_out = `$rvct22_cmd`;
+$rvct22_ver = $1 if ($rvct22_out =~ m#ARM/Thumb C/C\+\+ Compiler, RVCT2.2 (.*)#m);
+push @environment_info, {name=>'RVCT2.2', version=>$rvct22_ver};
+
+# RVCT 4.0
+my $rvct40_ver = 'N.A.';
+my $rvct40_path = '';
+if (defined $ENV{'SBS_RVCT40BIN'})
+{
+ $rvct40_path = $ENV{'SBS_RVCT40BIN'};
+}
+elsif (defined $ENV{'RVCT40BIN'})
+{
+ $rvct40_path = $ENV{'RVCT40BIN'};
+}
+my $rvct40_cmd = 'armcc 2>&1';
+$rvct40_cmd = "$rvct40_path\\$rvct40_cmd" if ($rvct40_path);
+my $rvct40_out = `$rvct40_cmd`;
+$rvct40_ver = $1 if ($rvct40_out =~ m#ARM C/C\+\+ Compiler, RVCT4.0 (.*)#m);
+push @environment_info, {name=>'RVCT4.0', version=>$rvct40_ver};
+
+# GCCE 4.4.1
+my $gcc441_ver = 'N.A.';
+my $gcc441_path = '';
+if (defined $ENV{'SBS_GCCE441BIN'})
+{
+ $gcc441_path = $ENV{'SBS_GCCE441BIN'};
+}
+elsif (defined $ENV{'GCCE441BIN'})
+{
+ $gcc441_path = $ENV{'GCCE441BIN'};
+}
+if ($gcc441_path)
+{
+ my $gcc441_cmd = "$gcc441_path\\arm-none-symbianelf-g++ -dumpversion";
+ my $gcc441_out = `$gcc441_cmd`;
+ $gcc441_ver = "4.4.1" if ($gcc441_out =~ /4.4.1/);
+}
+push @environment_info, {name=>'GCC4.4.1', version=>$gcc441_ver};
+
+
+for my $tool_info (@environment_info)
+{
+ print $tool_info->{name} . ": " . $tool_info->{version} . "\n";
+}
+
+
+# write diamonds file
+
+@environment_info = reverse(@environment_info);
+
+my $xml_content = <<_EOX;
+
+<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<diamonds-build>
+ <schema>10</schema>
+ <tools>
+_HERE_TOOLS_LINES_
+ </tools>
+</diamonds-build>
+_EOX
+
+my $tools_lines = '';
+for my $tool_info (@environment_info)
+{
+ $tools_lines .= " <tool><name>$tool_info->{name}</name><version>$tool_info->{version}</version></tool>\n";
+}
+
+$xml_content =~ s/_HERE_TOOLS_LINES_/$tools_lines/;
+
+if (open(ENVINFO, ">$output"))
+{
+ print ENVINFO $xml_content;
+ close(ENVINFO);
+ print "Wrote Diamonds file: $output\n";
+}
+else
+{
+ warn "Could not write to file: $output\n";
+}
\ No newline at end of file