--- a/common/build.postbuild.xml	Fri Jun 04 15:05:10 2010 +0100
+++ b/common/build.postbuild.xml	Fri Jun 04 16:42:15 2010 +0100
@@ -785,6 +785,9 @@
                 <zip destfile="${build.output.dir}/zips/release/build_BOM.zip">
                     <zipfileset dir="${build.drive}/output/logs/BOM" prefix="build_info/logs/BOM"/>
                     <zipfileset dir="${build.drive}/output/logs/releaseables" prefix="build_info/logs/releaseables"/>
+                    <zipfileset dir="${build.drive}/output/logs" prefix="build_info/logs/BOM">
+                        <include name="envinfo.txt"/>
+                    </zipfileset>
                 </zip>
                 <antcall target="sf-zip-content">
                     <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>

--- a/common/build.xml	Fri Jun 04 15:05:10 2010 +0100
+++ b/common/build.xml	Fri Jun 04 16:42:15 2010 +0100
@@ -153,11 +153,29 @@
     </target>
 
     <target name="sf-check-env">
-    	<!-- Dario's environment dumper -->
-    	<exec executable="perl" dir="${build.drive}/utilities/envinfo">
-            <arg value="envinfo.pl"/>
-            <arg value="-d"/>
-        </exec>
+        <echo message="Create report on environment info"/>
+        <!-- Dario's environment dumper -->
+    	  <if>
+            <isset property="sf.spec.baseline.location"/>
+            <then>
+                <exec executable="perl" dir="${build.drive}/utilities/envinfo">
+                    <arg value="envinfo.pl"/>
+                    <arg value="-r"/>
+                    <arg value="-c"/>
+                    <arg value="${sf.spec.baseline.location}"/>
+                </exec>
+            </then>
+            <else>
+                <exec executable="perl" dir="${build.drive}/utilities/envinfo">
+                    <arg value="envinfo.pl"/>
+                    <arg value="-r"/>
+                </exec>
+            </else>
+      </if>
+      <echo message="Translate \output\logs\envinfo.txt into a Diamonds file"/>
+      <exec executable="perl" dir="${build.drive}">
+          <arg value="${sf.common.config.dir}/tools/envinfo2diamonds.pl"/>
+      </exec>
     	
         <!-- Conditional location of BuildEnv.xml. Project always preferred to default -->
         <if><available file="${sf.project.location}/BuildEnv.xml"/>