equal
deleted
inserted
replaced
113 <stopwatch name="sf-prep"/> |
113 <stopwatch name="sf-prep"/> |
114 <echo>[SF-PREP]</echo> |
114 <echo>[SF-PREP]</echo> |
115 </target> |
115 </target> |
116 |
116 |
117 <target name="sf-check-env"> |
117 <target name="sf-check-env"> |
|
118 <!-- Dario's environment dumper --> |
|
119 <exec executable="perl" dir="${build.drive}"> |
|
120 <arg value="${sf.common.config.dir}/tools/envinfo.pl"/> |
|
121 </exec> |
|
122 |
118 <!-- Conditional location of BuildEnv.xml. Project always preferred to default --> |
123 <!-- Conditional location of BuildEnv.xml. Project always preferred to default --> |
119 <if><available file="${sf.project.location}/BuildEnv.xml"/> |
124 <if><available file="${sf.project.location}/BuildEnv.xml"/> |
120 <then> |
125 <then> |
121 <property name="sf.buildenv.location" value="${sf.project.location}"/> |
126 <property name="sf.buildenv.location" value="${sf.project.location}"/> |
122 </then> |
127 </then> |
205 <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml" todir="${build.log.dir}/BOM/"/> |
210 <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml" todir="${build.log.dir}/BOM/"/> |
206 <delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/> |
211 <delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/> |
207 </target> |
212 </target> |
208 |
213 |
209 <target name="sf-prebuild" depends="sf-prep,sf-prebuild-noprep"/> |
214 <target name="sf-prebuild" depends="sf-prep,sf-prebuild-noprep"/> |
210 <target name="sf-prebuild-noprep" depends="sf-prebuild-announce,sf-diamonds-connect,sf-diamonds-tag-build,sf-getenvs,sf-syncsource,sf-diamondize-bom"> |
215 <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"> |
211 <stopwatch name="sf-prebuild" action="elapsed"/> |
216 <stopwatch name="sf-prebuild" action="elapsed"/> |
212 </target> |
217 </target> |
213 |
218 |
214 <target name="sf-prebuild-announce"> |
219 <target name="sf-prebuild-announce"> |
215 <stopwatch name="sf-prebuild"/> |
220 <stopwatch name="sf-prebuild"/> |
222 <then> |
227 <then> |
223 <echo>[SF-DIAMONDS-CONNECT]</echo> |
228 <echo>[SF-DIAMONDS-CONNECT]</echo> |
224 <runtarget target="diamonds"/> |
229 <runtarget target="diamonds"/> |
225 <echo message="Save Diamonds build id value (${diamonds.build.id}) in a file"/> |
230 <echo message="Save Diamonds build id value (${diamonds.build.id}) in a file"/> |
226 <echo message="diamonds.build.id=${diamonds.build.id}" file="${build.log.dir}/diamonds_build_id.properties"/> |
231 <echo message="diamonds.build.id=${diamonds.build.id}" file="${build.log.dir}/diamonds_build_id.properties"/> |
|
232 </then> |
|
233 </if> |
|
234 </target> |
|
235 |
|
236 <target name="sf-diamonds-envinfo"> |
|
237 <if> |
|
238 <istrue value="${sf.spec.publish.enable}"/> |
|
239 <then> |
|
240 <echo>[SF-DIAMONDS-ENVINFO]</echo> |
|
241 <echo message="Send ${build.log.dir}/diamonds_envinfo.xml to Diamonds"/> |
|
242 <exec executable="python"> |
|
243 <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/> |
|
244 <arg value="-u"/> |
|
245 <arg value="http://${diamonds.host}${diamonds.build.id}"/> |
|
246 <arg value="-f"/> |
|
247 <arg value="${build.log.dir}/diamonds_envinfo.xml"/> |
|
248 </exec> |
227 </then> |
249 </then> |
228 </if> |
250 </if> |
229 </target> |
251 </target> |
230 |
252 |
231 <target name="sf-diamonds-tag-build"> |
253 <target name="sf-diamonds-tag-build"> |