common/build.xml
changeset 900 ed28a33746f2
parent 899 d80a65072ed8
parent 884 18fc0e69c5b8
child 901 1bec8957803b
--- a/common/build.xml	Tue Feb 16 17:50:17 2010 +0000
+++ b/common/build.xml	Tue Feb 16 17:57:06 2010 +0000
@@ -130,6 +130,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>
@@ -149,12 +154,12 @@
             <arg value="--tools='${sf.spec.sbs.tools.config}'"/>
             <arg value="Common"/>
         </exec>
-        <antcall target="sf-log-to-brag">
+        <!-- antcall target="sf-log-to-brag">
             <param name="sf.brag.phase" value="Prebuild"/>
             <param name="sf.brag.step" value="Build Environment Check"/>
             <param name="sf.brag.log" value="${build.log.dir}/BuildEnvironmentCheck.log"/>
             <param name="sf.brag.id" value="BuildEnvironmentCheck"/>
-        </antcall>
+        </antcall -->
         <fail>
             <condition>
                 <not>
@@ -222,7 +227,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>
     
@@ -242,6 +247,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>